2021-06-01 08:08:32 UTC

1141 files changed, 5277 insertions, 5277 deletions

diff --git a/metadata/md5-cache/dev-ros/actionlib-1.13.2 b/metadata/md5-cache/dev-ros/actionlib-1.13.2
index aa4d9e0e8498..da9827a0db73 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.13.2
+++ b/metadata/md5-cache/dev-ros/actionlib-1.13.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.2.tar.gz -> actionlib-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a0b01f60abb44e363241aa89755c69cd
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index b5f0aa7be17f..f37d85d1c30b 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -1,16 +1,16 @@
 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/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a0b01f60abb44e363241aa89755c69cd
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
index 408143290d0d..aeac8d960373 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.1 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.1
index 4c7b0a7b15cc..17dfb154571c 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3de889a6617176641f6633c6667a5667
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-9999 b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
index b7303fbaa6a8..0e2ed48d5f0e 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2 b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
index b009e99fbcd0..c0e73aa73509 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tools for dealing with actionlib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.2.tar.gz -> actionlib-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b64bfc7adca94d4d6b324787a92d90a1
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-9999 b/metadata/md5-cache/dev-ros/actionlib_tools-9999
index 1cd8fd544036..2cc78b90086d 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tools for dealing with actionlib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b64bfc7adca94d4d6b324787a92d90a1
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
index 4ea2f4ea8433..58c55bb0e166 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/actionlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
index 54f9f8bcf16b..c934b3164e83 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/actionlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999 b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
index 3b3971e0479c..ce74bfc74a8f 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
@@ -1,16 +1,16 @@
 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-ros/actionlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/actionlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/amcl-1.17.0 b/metadata/md5-cache/dev-ros/amcl-1.17.0
index ce51c05b5f4f..7ddeb4e5ffeb 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.17.0
+++ b/metadata/md5-cache/dev-ros/amcl-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/map_server[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz http://download.ros.org/data/amcl/basic_localization_stage_indexed.bag -> amcl-1.17.0-basic_localization_stage_indexed.bag http://download.ros.org/data/amcl/global_localization_stage_indexed.bag -> amcl-1.17.0-global_localization_stage_indexed.bag http://download.ros.org/data/amcl/small_loop_prf_indexed.bag -> amcl-1.17.0-small_loop_prf_indexed.bag http://download.ros.org/data/amcl/small_loop_crazy_driving_prg_indexed.bag -> amcl-1.17.0-small_loop_crazy_driving_prg_indexed.bag http://download.ros.org/data/amcl/texas_greenroom_loop_indexed.bag -> amcl-1.17.0-texas_greenroom_loop_indexed.bag http://download.ros.org/data/amcl/texas_willow_hallway_loop_indexed.bag -> amcl-1.17.0-texas_willow_hallway_loop_indexed.bag http://download.ros.org/data/amcl/rosie_localization_stage.bag -> amcl-1.17.0-rosie_localization_stage.bag http://download.ros.org/data/amcl/willow-full.pgm -> amcl-1.17.0-willow-full.pgm http://download.ros.org/data/amcl/willow-full-0.05.pgm -> amcl-1.17.0-willow-full-0.05.pgm
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=402b9b36331387dd8c11c477ffda2c05
diff --git a/metadata/md5-cache/dev-ros/amcl-1.17.1 b/metadata/md5-cache/dev-ros/amcl-1.17.1
index d33a9fca4eb3..dab82f41f973 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.17.1
+++ b/metadata/md5-cache/dev-ros/amcl-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/map_server[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz http://download.ros.org/data/amcl/basic_localization_stage_indexed.bag -> amcl-1.17.1-basic_localization_stage_indexed.bag http://download.ros.org/data/amcl/global_localization_stage_indexed.bag -> amcl-1.17.1-global_localization_stage_indexed.bag http://download.ros.org/data/amcl/small_loop_prf_indexed.bag -> amcl-1.17.1-small_loop_prf_indexed.bag http://download.ros.org/data/amcl/small_loop_crazy_driving_prg_indexed.bag -> amcl-1.17.1-small_loop_crazy_driving_prg_indexed.bag http://download.ros.org/data/amcl/texas_greenroom_loop_indexed.bag -> amcl-1.17.1-texas_greenroom_loop_indexed.bag http://download.ros.org/data/amcl/texas_willow_hallway_loop_indexed.bag -> amcl-1.17.1-texas_willow_hallway_loop_indexed.bag http://download.ros.org/data/amcl/rosie_localization_stage.bag -> amcl-1.17.1-rosie_localization_stage.bag http://download.ros.org/data/amcl/willow-full.pgm -> amcl-1.17.1-willow-full.pgm http://download.ros.org/data/amcl/willow-full-0.05.pgm -> amcl-1.17.1-willow-full-0.05.pgm
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=402b9b36331387dd8c11c477ffda2c05
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index 41b18ba96dde..6c104628075d 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -1,17 +1,17 @@
 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/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/map_server[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/amcl/basic_localization_stage_indexed.bag -> amcl-9999-basic_localization_stage_indexed.bag http://download.ros.org/data/amcl/global_localization_stage_indexed.bag -> amcl-9999-global_localization_stage_indexed.bag http://download.ros.org/data/amcl/small_loop_prf_indexed.bag -> amcl-9999-small_loop_prf_indexed.bag http://download.ros.org/data/amcl/small_loop_crazy_driving_prg_indexed.bag -> amcl-9999-small_loop_crazy_driving_prg_indexed.bag http://download.ros.org/data/amcl/texas_greenroom_loop_indexed.bag -> amcl-9999-texas_greenroom_loop_indexed.bag http://download.ros.org/data/amcl/texas_willow_hallway_loop_indexed.bag -> amcl-9999-texas_willow_hallway_loop_indexed.bag http://download.ros.org/data/amcl/rosie_localization_stage.bag -> amcl-9999-rosie_localization_stage.bag http://download.ros.org/data/amcl/willow-full.pgm -> amcl-9999-willow-full.pgm http://download.ros.org/data/amcl/willow-full-0.05.pgm -> amcl-9999-willow-full-0.05.pgm
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=402b9b36331387dd8c11c477ffda2c05
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
index 42b97e551f5c..b8d60489445c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1
index 695b1371e9dd..4a9d9c5a3d91 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.4 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.4
index c8e940da189c..d7f91606e454 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
index 590b8f32abac..e912ac56a379 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
index 30d6ac4ded90..ba67f12cc2bc 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
 EAPI=7
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=3b6f3621a302400443dcdaccf8a73501
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
index 77e1659c6a46..f9fae96cd195 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
index 9f969047cc7f..728709e64897 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1
index 82ee1037d4ab..56499bd42fe6 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.3
index 80b5ecb20ac0..f8948b3e8826 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.4
index e11b1e7b9ed5..199429901e03 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.3
index 960aabb1e6fd..9f9bc6124e5e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-9999 b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
index 282a82ea81e7..106344be04c9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-python/ament_package dev-python/catkin_pkg
 DESCRIPTION=The core of the ament buildsystem in CMake
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=a0b632d6831d1cc03c129f771c596a0f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0
index 0e9ab7e8b93c..640bc1c50721 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df246eae87e8558dd82d36871eb24848
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.1
index cf727112f729..99b94c6fce69 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df246eae87e8558dd82d36871eb24848
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.4 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.4
index 6067107bedd4..5dce15afe004 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df246eae87e8558dd82d36871eb24848
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5
index 5427235cb23c..0897e171e376 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df246eae87e8558dd82d36871eb24848
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
index 61d6dd07d1b3..a2ff0edd8caf 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
 EAPI=7
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=df246eae87e8558dd82d36871eb24848
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0
index 2e53069fe42f..d974a344fa29 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e6dc7a1f998d6f0bb2f91b0e053c251d
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.1
index 2735387ae84d..c49fa48afea2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e6dc7a1f998d6f0bb2f91b0e053c251d
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.4 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.4
index 8e54d2b26fbf..8f5dc11e3e79 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e6dc7a1f998d6f0bb2f91b0e053c251d
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5
index c78f62fb9a3c..ed4b1c92c1f3 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e6dc7a1f998d6f0bb2f91b0e053c251d
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
index af87c94f06d6..f76a6851376c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
 EAPI=7
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=e6dc7a1f998d6f0bb2f91b0e053c251d
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6
index 01f52cbb2180..0a78077d2974 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
index a2a4b6c3cfd1..8f48a2b3b3c9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1
index 2592bdbd611f..c817e7e04019 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3
index 1c5f6b3cd94d..61b73394b977 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.4
index 9aa3e777b050..d8329e05b2eb 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.3
index 559a1bce5c67..8908b7d370d6 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
index b94ff69565de..738062a13fc8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=a9af0f2a7965c199d2327c5fe1f30e0c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6
index 64d5b617c98e..ea80579078dd 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
index ea0d3dab47f1..e2e94a6e0376 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1
index 6d8ec6c0d03e..ad9c4efe96cd 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3
index e69a4f503f24..a3d4df7c38e0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.4
index b419f914789b..c13438ab22df 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.3
index 97a2a5cef43a..14346b321496 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
index 969334bdbcbf..75fa6c3573fa 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=eb50adc30959016f24916fc405cab850
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6
index 691a56268716..d8aa997b8e0d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0
index a4b4602b5462..ac9ce33f565e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1
index 98f61bea1623..9b7d238e77b0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3
index 7dd350e882ab..8aa253ecb83c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.4
index bba4e96648bd..ad7fef7bafb2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.3
index 78af8e7e21c3..a20d94ed8082 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
index 56db6ba990f1..a60ca8766ce9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6
index eb211ae0c485..f459667ad7da 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0
index b16ae12110bf..1b43589c9fa1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1
index ec696fe14b34..dab1f1a13154 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3
index fd8051a9a14c..825d95c38487 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.4
index 536a9a25e14f..c170e951a9e3 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.3
index c878fcb086bd..da83b142c2dc 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
index 9b7e54d5a2d8..2b487567cbd8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=4b7d323e8d414b908a683a940305a347
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6
index 49c5754a8ed7..d1bc66a15fec 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0
index 0e7291e15481..0f0451fed83c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1
index 93a63bbe057b..6e27a3594662 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3
index 10350eb23c2f..f537e751ce7c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.4
index f17eff3c15fa..bb4a14cf16d8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.3
index edefdf53210c..2a2a0c98c810 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
index da1fe682af68..6680548afdf5 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=ad658f8915e93b83ec7eeeb811d8197a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6
index bd2309ab86e7..08a2074ac5cc 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0
index d5cd34118196..389473d7ece5 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1
index fb35426a021b..84e5a59554ec 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3
index a7b62ead5db0..57c33c4e99da 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.4
index 5b1e6aeaf6bd..12c4e591b4d1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.3
index aa466ca9c64e..2bb8060e80b6 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999
index 515774597280..3110c15ec89a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=e50b2451e54958a7c15e926e61489489
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6
index 8c7ea2ebb6cc..d123d9268d3d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0
index d9b920fe9e10..90826f24e382 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1
index 7e2b6779e11d..664098d8acd8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3
index b9cd468e9771..9ef24b5620a9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.4
index 8823ba040334..f5725235c433 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.3
index da2558966f3b..6d53f2d47187 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999
index e376c3ea1094..bf3946b38d03 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 DESCRIPTION=Export targets to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=6544ac7fd951fbc32240f6ed922a5796
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0
index 4840214ff349..b6c11e077954 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1
index 6a8fe5b40b60..d55a405eadce 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3
index f71e18c2a5c1..7eba0605bf04 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.4
index 7166abed359e..9499a8ae7c5f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.3
index 0e163df2cbe4..3c091ac76de1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999
index 9da79ff99e2c..40b6b78a3434 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=d2f45cfb8cafae650101a8303fe39401
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6
index d452a3db3284..9cdac35c613b 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0
index 82288eeb20b9..47108df5fcaa 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1
index 30ba289c29d4..e47a7dbad247 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3
index 107f35e75b63..706f766a1cd0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.4
index 498199ab7aee..860f6ed3513c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.3
index 1e5ffad6c3b5..2612607e058e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999
index a0fe22ca3ade..3a082a910f67 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=8a13131443a229063d59fa5a377767d1
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6
index 691a56268716..d8aa997b8e0d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0
index a4b4602b5462..ac9ce33f565e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1
index 98f61bea1623..9b7d238e77b0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3
index 7dd350e882ab..8aa253ecb83c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.4
index bba4e96648bd..ad7fef7bafb2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.3
index 78af8e7e21c3..a20d94ed8082 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999
index 56db6ba990f1..a60ca8766ce9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=222bd27533132c523de0e4987958286a
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6
index 3fdb2b747c99..53a56a9d1811 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0
index 05aad3346edb..72504476dd39 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1
index 34358cdfca58..c6501ef95f65 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3
index 6126b8693d1c..167cb497011e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.4
index bdb237c34d6a..a2e12738d787 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.3
index f9c4a865a952..f00557367aba 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999
index c812cdd41a70..84d796766457 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=b394da7853cf2cdef82ee9007a9c774b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0
index 8dc422051101..a18c0120df6a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=532d50a884fe2ae31cd91f245e7a6789
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.1
index 98a17bfec527..bc0e286cae90 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=532d50a884fe2ae31cd91f245e7a6789
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.4 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.4
index 0d9ba61600bf..a3a857b3e414 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=532d50a884fe2ae31cd91f245e7a6789
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5
index 1c13f011da9b..2a8db32c3a27 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=532d50a884fe2ae31cd91f245e7a6789
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999
index d234f4183362..468cd55e3d1b 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_lint_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=532d50a884fe2ae31cd91f245e7a6789
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0
index aed249aaa104..0efa3750a83a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1
index fff05c7eb5ff..f1f0248cc002 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3
index 5da3a5e1e567..0d100ade012a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.4
index 54767ecb9fc2..bf2ae81144f1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.3
index cf94fa625437..0f77bfb7bc5e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999
index 960df57a9dd1..7fbacc60ceb1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=df71a2762b5eea83dd0dc88e81d30eea
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6
index b64821b31baf..c9eebbba5c76 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0
index eca631fb3ffc..1a97f5464bbe 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1
index 56f543d7dd6d..8259e3cbf11d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3
index 6bb53ed17208..e44d91817135 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.4
index a8fd2fe370a9..d84b998de22f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.3
index 72412a71d183..f945754bbd6a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-9999 b/metadata/md5-cache/dev-ros/ament_cmake_python-9999
index ddbae2d7c95a..3e189777e881 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=The ability to use Python in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=20f45428dbde1a86d72c103336a99a0b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.1 b/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.1
index 79cb7aec406d..763eb459a507 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=
 DESCRIPTION=ROS specific CMake bits in the ament buildsystem
@@ -12,5 +12,5 @@ RDEPEND=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros2/ament_cmake_ros/archive/0.9.1.tar.gz -> ament_cmake_ros-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=12882647a178e348bd0c8a57cec2c397
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_ros-9999 b/metadata/md5-cache/dev-ros/ament_cmake_ros-9999
index 71920fda2c99..90f9ca018b66 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_ros-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_ros-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=
 DESCRIPTION=ROS specific CMake bits in the ament buildsystem
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=12882647a178e348bd0c8a57cec2c397
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6
index 42f20f2dceed..46d99cb6eb97 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0
index 01d324d97376..c8807d2cfbd9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1
index 2c7388140e37..5a076e10d1bc 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3
index 3b851ca88f63..fce383ee7abe 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.4
index 4181a4a53511..da3e152a13c3 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.3
index ce4c75205afb..27cd03572b01 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999
index c4d2e781db8e..a63463cfc9c5 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=f375d962c4d4bc0c6d10b5a94384451f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6
index 8ee687d356c8..69b4737969c9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6
@@ -1,16 +1,16 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0
index f2c75303149a..58cc77ec1160 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1
index 1a68ff5156d0..7bddf1d67f74 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1
@@ -1,16 +1,16 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3
index f80522bf7a82..2efe6a7cb944 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.3
@@ -1,16 +1,16 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.4
index ee640da62d7c..d2925fdcf7a0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.4
@@ -1,16 +1,16 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.3
index 39a81c6d4849..6e3c4c4e50a5 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.1.3
@@ -1,16 +1,16 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-9999 b/metadata/md5-cache/dev-ros/ament_cmake_test-9999
index 58db100f907c..61f4982dda52 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DESCRIPTION=The ability to add tests in the ament buildsystem
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_cmake
 INHERIT=cmake python-r1 git-r3
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=8d545951500d187e21d9da907676ac7f
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0
index 58b65051edb5..ef3e28ea9d5d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=057cc10de9d07a034cf259126c5d8eaa
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.1
index 45c4c7c265b6..458d0e5d07b0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=057cc10de9d07a034cf259126c5d8eaa
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.4 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.4
index a2c4278404a2..562ab2af96a8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=057cc10de9d07a034cf259126c5d8eaa
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5
index 92ecb1550d86..300c8d20fff2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=057cc10de9d07a034cf259126c5d8eaa
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999
index d5ac67ac9e3a..78f55cf1b058 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
 EAPI=7
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=057cc10de9d07a034cf259126c5d8eaa
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6
index a8232c9a10bb..a7a0c8a9194b 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0
index 70cea8b8e73b..99dc6df24405 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1
index 4bcdb8fa6330..0a5994dac13f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3
index 95a587f23fba..161e0e104fd0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.3.tar.gz -> ament_cmake-1.0.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.4 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.4
index df46ca266a81..6fe001895754 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.4.tar.gz -> ament_cmake-1.0.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.3 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.3
index 4f1a117a1f70..0e4e2e255e80 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.3
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.1.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.1.3.tar.gz -> ament_cmake-1.1.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-9999 b/metadata/md5-cache/dev-ros/ament_cmake_version-9999
index 01a0f4df45aa..4b6f130c48e3 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core
 DESCRIPTION=Override the exported package version in the ament buildsystem
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=c3025cc1b78e86f7cc21a1eda50b878e
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0
index 72d57ef25b89..b040095d1aa0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_xmllint[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ac9bd4649e32f9da3743e29950c96fbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.1 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.1
index 5e32ea867a49..6994d602a162 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_xmllint[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ac9bd4649e32f9da3743e29950c96fbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.4 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.4
index 677d2de0f775..7e209d4a70e3 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_xmllint[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ac9bd4649e32f9da3743e29950c96fbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
index 729d7202c5f0..8535b015a3d9 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_xmllint[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
 EAPI=7
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=ac9bd4649e32f9da3743e29950c96fbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
index 049e6d1727e1..8bd38b6d6b2a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-ros/ament_xmllint[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-ros/ament_xmllint[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
 EAPI=7
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=ac9bd4649e32f9da3743e29950c96fbc
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
index 9a3b7fb7bcb3..7e1a1819b45e 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check source files for copyright and license information.
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.1 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.1
index 5399588e4db9..6489346d8669 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.10.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check source files for copyright and license information.
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.4 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.4
index 546a12f3a757..5341a264f376 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.10.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check source files for copyright and license information.
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-9999 b/metadata/md5-cache/dev-ros/ament_copyright-9999
index 87896488b7b5..fa6c01e9ec3a 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_copyright-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check source files for copyright and license information.
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=b51a35829ca5161511555eb6e2deba79
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
index 9964d1b00ba4..7edf2ad27302 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=df32eb776381a45ef38ac0bbfc287a4f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1
index 8dadaf71b1ae..2dcaa8ee1a28 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=df32eb776381a45ef38ac0bbfc287a4f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
index cdfc23b654bf..0a76b1afd938 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=df32eb776381a45ef38ac0bbfc287a4f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
index 42fc62855dbd..ea326601b39c 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/cppcheck python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=df32eb776381a45ef38ac0bbfc287a4f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
index 9f41df5590ca..2955073106a8 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code against the Google style conventions using cpplint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1
index 5122c4da57c2..3505d7109b3f 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code against the Google style conventions using cpplint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4
index 2bbee2038a5e..00eb66fe18f5 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code against the Google style conventions using cpplint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cpplint-9999
index 72fe780a41f5..40ae6aaa4105 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code against the Google style conventions using cpplint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=d8e2e74b0f783c1dad8e9fc16200d09f
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
index 3601ac2b4b2b..40ae22860ad8 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code for style and syntax conventions with flake8
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.1 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.1
index 46eb55bf5c7a..13f2e25bce4f 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code for style and syntax conventions with flake8
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.4 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.4
index dc600827e438..c5e0fd57cbc7 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code for style and syntax conventions with flake8
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-9999 b/metadata/md5-cache/dev-ros/ament_flake8-9999
index 90e954f38b8f..a8dfe66c04c3 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-9999
+++ b/metadata/md5-cache/dev-ros/ament_flake8-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=The ability to check code for style and syntax conventions with flake8
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=51b96184539923a242f4d28c1ec0837e
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
index 32658861ed19..c5b9766ceb49 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Common API for ament linter packages
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.1 b/metadata/md5-cache/dev-ros/ament_lint-0.10.1
index 7dccb4994806..bd4d09a64865 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Common API for ament linter packages
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.4 b/metadata/md5-cache/dev-ros/ament_lint-0.10.4
index 87f22c22ace4..cacb841c601d 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Common API for ament linter packages
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.9.5 b/metadata/md5-cache/dev-ros/ament_lint-0.9.5
index 4d817b790b73..708585a1a5d4 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.9.5
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Common API for ament linter packages
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint-9999 b/metadata/md5-cache/dev-ros/ament_lint-9999
index a6fa22ba5cf9..6127f17b77af 100644
--- a/metadata/md5-cache/dev-ros/ament_lint-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Common API for ament linter packages
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=75b7a1f1ff0f2cda4fed8b028a24db81
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0
index 95ce7c797166..627177a014de 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c9b12264061281ddb67661a479dd747c
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.1 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.1
index 3012c585343b..6d62d3e5c476 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c9b12264061281ddb67661a479dd747c
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.4 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.4
index f8cfb60b8567..618d65cd0d88 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c9b12264061281ddb67661a479dd747c
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
index ac16739b009b..690f66b43b61 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=c9b12264061281ddb67661a479dd747c
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-9999 b/metadata/md5-cache/dev-ros/ament_lint_auto-9999
index 9136449b54dd..f95dbaad8cae 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 DESCRIPTION=The auto-magic functions for ease to use of the ament linters
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=c9b12264061281ddb67661a479dd747c
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
index 5d7754b14ce0..3b30c49f85e8 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1
index 8c6a49d1ee8e..011d1c2826d0 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4
index 0beac99f74be..27fefc58f218 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999 b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
index 19712baacccd..7b062074259c 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=0e4aee9461d30afdc810b97ceb0d63d8
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
index b6cac52215bc..4e936d414e1e 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.1 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.1
index bed6012e0a8e..9f32342df1ba 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.4 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.4
index 4e478b4ee9a1..ebb94578daae 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-9999 b/metadata/md5-cache/dev-ros/ament_pep257-9999
index c98ff0de4625..4a3d1f72e824 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-9999
+++ b/metadata/md5-cache/dev-ros/ament_pep257-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=5dcc7a0427086df05d289cd795c6d301
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
index 59d727a32a58..60db9381fdc5 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to check code against style conventions using uncrustify
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=eb345c3542943bfa3cc9d2cb13a67295
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1
index be378918d99b..bf631d0b6120 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to check code against style conventions using uncrustify
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=eb345c3542943bfa3cc9d2cb13a67295
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
index d0a2b9b1b173..70ad8b2ddaca 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=The ability to check code against style conventions using uncrustify
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=eb345c3542943bfa3cc9d2cb13a67295
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-9999 b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
index b9247f29d301..33f815c72172 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=The ability to check code against style conventions using uncrustify
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-util/uncrustify python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=eb345c3542943bfa3cc9d2cb13a67295
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
index d5f4e03ebe91..45679d5271e8 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks XML files like the package manifest using xmllint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1
index 1cebd570c4b9..366d6a692bf7 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks XML files like the package manifest using xmllint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.1.tar.gz -> ament_lint-0.10.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4
index e984c99d9a3d..3b2b742aeab6 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.4
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks XML files like the package manifest using xmllint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.10.4.tar.gz -> ament_lint-0.10.4.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_xmllint-9999
index 716982aa075c..da6de3ef487d 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] )
 DESCRIPTION=Checks XML files like the package manifest using xmllint
 EAPI=7
 HOMEPAGE=https://github.com/ament/ament_lint
 INHERIT=distutils-r1 git-r3
-IUSE=test test python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-ros/ament_lint[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_8(-)?,-python_single_target_python3_8(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	distutils-r1	f0ca511df3fddd316b783632b804e8fb	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=69f974ff10536a0c1ea9b3279647a084
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.13 b/metadata/md5-cache/dev-ros/angles-1.9.13
index 4bc963a2ac58..78cf9b34d14a 100644
--- a/metadata/md5-cache/dev-ros/angles-1.9.13
+++ b/metadata/md5-cache/dev-ros/angles-1.9.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/angles/archive/1.9.13.tar.gz -> angles-1.9.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/angles-9999 b/metadata/md5-cache/dev-ros/angles-9999
index dcfade5fe003..04b18e887f79 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -1,16 +1,16 @@
 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=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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.10 b/metadata/md5-cache/dev-ros/audio_capture-0.3.10
index 508577ee38b2..ca0617584239 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.10
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.10
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.10.tar.gz -> audio_common-0.3.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76d98f7ff61d9d28ea98a7c4a540db94
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.11 b/metadata/md5-cache/dev-ros/audio_capture-0.3.11
index bc37bc73168d..189daab4fc78 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.11
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.11
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.11.tar.gz -> audio_common-0.3.11.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76d98f7ff61d9d28ea98a7c4a540db94
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.6 b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
index 93d445fdf91c..cb825f01fb8b 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.7 b/metadata/md5-cache/dev-ros/audio_capture-0.3.7
index 4536ba55b373..0723f21bc305 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.7
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.8 b/metadata/md5-cache/dev-ros/audio_capture-0.3.8
index fc5b1e253b4b..26408a7c62e1 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.8
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.8
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.8.tar.gz -> audio_common-0.3.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-9999 b/metadata/md5-cache/dev-ros/audio_capture-9999
index a5998aeaae99..d9b1ada96e75 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -1,16 +1,16 @@
 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-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.10 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.10
index f00f25efc7d7..dc207fa5601f 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.10
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.10
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.10.tar.gz -> audio_common-0.3.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=81aa28caf785771f4651de5a33334da8
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.11 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.11
index 203bf9e03171..857c0080a79c 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.11
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.11
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.11.tar.gz -> audio_common-0.3.11.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=81aa28caf785771f4651de5a33334da8
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
index 1057b779a901..84c0118e047c 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
index 058eb7d00dff..50d8aa5cc8f0 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.8 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.8
index 7f9d625bd177..16afce46f2d0 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.8
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.8
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.8.tar.gz -> audio_common-0.3.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-9999 b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
index e3e476662a32..1281104ab4b1 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.10 b/metadata/md5-cache/dev-ros/audio_play-0.3.10
index 80bbbf412dea..f50a39d87ffd 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.10
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.10
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.10.tar.gz -> audio_common-0.3.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d578e202896eba1b2f044e048a06de74
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.11 b/metadata/md5-cache/dev-ros/audio_play-0.3.11
index dee6123607ed..530c53459d08 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.11
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.11
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.11.tar.gz -> audio_common-0.3.11.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d578e202896eba1b2f044e048a06de74
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.6 b/metadata/md5-cache/dev-ros/audio_play-0.3.6
index 99c167ccd456..78059b374b97 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.6
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.7 b/metadata/md5-cache/dev-ros/audio_play-0.3.7
index 41d3c23c0b02..d861f8e0d8bb 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.7
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.8 b/metadata/md5-cache/dev-ros/audio_play-0.3.8
index faba6b4313fd..3c720942186f 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.8
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.8
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.8.tar.gz -> audio_common-0.3.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-9999 b/metadata/md5-cache/dev-ros/audio_play-9999
index 4cd3d6a9d0b6..9add3b49841e 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -1,16 +1,16 @@
 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-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.17.0 b/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
index 0a13e568b357..af0cd8a5c107 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f947d2cb6fe176df3738c8c6df211905
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.17.1 b/metadata/md5-cache/dev-ros/base_local_planner-1.17.1
index dcb5af48d3bb..cf42e8066b17 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.17.1
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f947d2cb6fe176df3738c8c6df211905
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-9999 b/metadata/md5-cache/dev-ros/base_local_planner-9999
index 30aea1867057..1cc7173afa46 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f947d2cb6fe176df3738c8c6df211905
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.5 b/metadata/md5-cache/dev-ros/bond-1.8.5
index 24acc0219cc1..4c5a4d357164 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/bond-1.8.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.6 b/metadata/md5-cache/dev-ros/bond-1.8.6
index f78a39fe7467..b1fe82831b52 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.6
+++ b/metadata/md5-cache/dev-ros/bond-1.8.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bond-9999 b/metadata/md5-cache/dev-ros/bond-9999
index 55f919584723..5e5e64beceb6 100644
--- a/metadata/md5-cache/dev-ros/bond-9999
+++ b/metadata/md5-cache/dev-ros/bond-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bond https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.5 b/metadata/md5-cache/dev-ros/bondcpp-1.8.5
index 0a88ae924ac6..4ffdfbefd813 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondcpp https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.6 b/metadata/md5-cache/dev-ros/bondcpp-1.8.6
index 5e06b1d848c1..60dd24d9e535 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.6
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondcpp https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondcpp-9999 b/metadata/md5-cache/dev-ros/bondcpp-9999
index 55ebc72f0ffb..cedc822226b5 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-9999
+++ b/metadata/md5-cache/dev-ros/bondcpp-9999
@@ -1,16 +1,16 @@
 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/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondcpp https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smclib dev-libs/boost:= sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.5 b/metadata/md5-cache/dev-ros/bondpy-1.8.5
index 66708e035aa4..9d4e5b6e20ed 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/bond[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondpy https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bond[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.6 b/metadata/md5-cache/dev-ros/bondpy-1.8.6
index 5d8d765e884f..5692bfb2b092 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.6
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/bond[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondpy https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bond[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/bondpy-9999 b/metadata/md5-cache/dev-ros/bondpy-9999
index 09d24811d470..fbeb07488b01 100644
--- a/metadata/md5-cache/dev-ros/bondpy-9999
+++ b/metadata/md5-cache/dev-ros/bondpy-9999
@@ -1,16 +1,16 @@
 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/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/bond[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python implementation of bond, for checking when another process has terminated
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/bondpy https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bond[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smclib sys-apps/util-linux python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14 b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
index 1b94c84c625c..99cafbcab088 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_estimation https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fa76d91e76e67f399830ed7e5d76f059
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-9999 b/metadata/md5-cache/dev-ros/calibration_estimation-9999
index d00839a95f30..8f9636c919fb 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -1,16 +1,16 @@
 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-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_estimation https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/scipy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fa76d91e76e67f399830ed7e5d76f059
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
index de68602cba14..b92ffe420938 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files for configuring the calibration stack to run on your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_launch https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b7f19cf72a5d99628726d97812d758f4
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-9999 b/metadata/md5-cache/dev-ros/calibration_launch-9999
index df844937e566..a1810a24e76f 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files for configuring the calibration stack to run on your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_launch https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser_cb_detector dev-ros/monocam_settler dev-ros/roslaunch dev-libs/urdfdom python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b7f19cf72a5d99628726d97812d758f4
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14 b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
index 35b50fa92d78..fd634d289407 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dfdbf88ea58efa0567ef1b7e13961029
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-9999 b/metadata/md5-cache/dev-ros/calibration_msgs-9999
index 7e73b057b0fd..de71429ca3c1 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-9999
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dfdbf88ea58efa0567ef1b7e13961029
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14 b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
index 078b50742c83..dac5b462040c 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_setup_helper https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/calibration_launch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=857ec1b6e75a7d4be74b62f90af83e66
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999 b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
index fb4e53d9ddde..ab5ab0802681 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_setup_helper https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/calibration_launch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=857ec1b6e75a7d4be74b62f90af83e66
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.15.2 b/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
index de677888655a..3fa746b141c1 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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 http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> camera_calibration-1.15.2-camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> camera_calibration-1.15.2-multi_board_calibration.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dfb2fa254ac35e47e4dd86325d7120d7
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.15.3 b/metadata/md5-cache/dev-ros/camera_calibration-1.15.3
index 570747e41b9e..0d3cead92142 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.15.3
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.15.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> camera_calibration-1.15.3-camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> camera_calibration-1.15.3-multi_board_calibration.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5bd79f62ed7c808e09ad7c5fb4ffd7ef
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-9999 b/metadata/md5-cache/dev-ros/camera_calibration-9999
index 2f7edf71ce0e..e4aaa2d273b2 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration-9999
@@ -1,17 +1,17 @@
 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[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> camera_calibration-9999-camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> camera_calibration-9999-multi_board_calibration.tar.gz
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dfb2fa254ac35e47e4dd86325d7120d7
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
index 302e095e4b95..d86909eeb4ad 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosbash ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosbash ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=36995f8465c691edde3fa6cd35e1e7ae
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
index 89e1862fa1a3..9bb76db4d0cf 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -1,16 +1,16 @@
 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-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosbash ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosbash ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=36995f8465c691edde3fa6cd35e1e7ae
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0 b/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
index 2c0f2e7c11e7..7f7b312dc00e 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f3caa7e5ebd1981f0464ca1cbc11d9ca
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-9999 b/metadata/md5-cache/dev-ros/camera_info_manager-9999
index 6a72dc82f7c5..82304f5ac146 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -1,16 +1,16 @@
 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/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest dev-cpp/gtest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f3caa7e5ebd1981f0464ca1cbc11d9ca
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1 b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
index 2381c3da34de..f24580806407 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4aba74e6e586813ce43e714830383858
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.17.1 b/metadata/md5-cache/dev-ros/carrot_planner-1.17.1
index bb66e7e2a1d8..82adb08bc179 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.17.1
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4aba74e6e586813ce43e714830383858
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index 7604ba136008..92af9cdd3090 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -1,16 +1,16 @@
 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/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4aba74e6e586813ce43e714830383858
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.5.0 b/metadata/md5-cache/dev-ros/class_loader-0.5.0
index 1d8d2a5a0db6..e3a627a688bb 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.5.0
+++ b/metadata/md5-cache/dev-ros/class_loader-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
 SRC_URI=https://github.com/ros/class_loader/archive/0.5.0.tar.gz -> class_loader-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/class_loader-9999 b/metadata/md5-cache/dev-ros/class_loader-9999
index 5f1f9dbd67ca..4e8c1b07ef0a 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
index d6af6e1ba48c..6b13b86996f1 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1
index 6d0ec8e8fbe5..2b4e67d971f0 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index 7a3b6fba81b0..7b0cd3c53ee3 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -1,16 +1,16 @@
 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/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0 b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
index 7bbe995df807..fb1b27a23f86 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=CMake Modules which are commonly used by ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/cmake_modules/archive/0.5.0.tar.gz -> cmake_modules-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-9999 b/metadata/md5-cache/dev-ros/cmake_modules-9999
index 05bc52810c4f..a5cd576496b6 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=CMake Modules which are commonly used by ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.13 b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
index cfbdec155c07..1da7a8deeb88 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.13.tar.gz -> collada_urdf-1.12.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index 107daa4a4df9..9e8f97adcb08 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -1,16 +1,16 @@
 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:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
index 8e50ceb0f8cb..3441ea638ef6 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.13.tar.gz -> collada_urdf-1.12.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4115555a31f7ef057529bde59ca5e1c3
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index 04746bb4eda5..b6517ad8ad38 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4115555a31f7ef057529bde59ca5e1c3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
index 3696fa34ad31..3ffaffc0b023 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
index 8570882d5b01..1e380e2b8005 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.3 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.3
index 7d23867c0c2b..8dedcd77fce5 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.3
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.4 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.4
index e948419458f1..086219065bc6 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.4
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0496b4185e968cd07a0da34070ff235e
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
index e0b9bb25b38b..fe410926fbcf 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
@@ -1,16 +1,16 @@
 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/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=df7e8a0862fa84f81e4346d497255bc3
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 d033bfb2131c..3000fda52010 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,17 +1,17 @@
 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_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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
index 044544334bf1..a02d62025b42 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
@@ -1,17 +1,17 @@
 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_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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.3 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.3
index 180be4b97cc3..400c086dfa9b 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.3
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.3
@@ -1,17 +1,17 @@
 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_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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.4 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.4
index 228034e783a1..30767fbaabdb 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.4
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.4
@@ -1,17 +1,17 @@
 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_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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b01c755809c7a63b70ab8b3eb22b51eb
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 b4f5022bf87c..6e76cffc6f3d 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -1,16 +1,16 @@
 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_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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0-r1 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0-r1
index e34bfd2d2387..0adba73bf62b 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0-r1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6fb5c2935de9b9b4d268d9243c85dfb0
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 e4b07702f4aa..a636a2544d6f 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6fb5c2935de9b9b4d268d9243c85dfb0
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0-r1 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0-r1
index d86566f3a8ac..2e3c6dd50a47 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0-r1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Plugin for transparently sending images encoded as JPEG or PNG
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_image_transport https://github.com/ros-perception/image_transport_plugins
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f5571bb393c586db28f48f47a5ac6002
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
index f0beb9357b61..89fa92bcbe2d 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Plugin for transparently sending images encoded as JPEG or PNG
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/compressed_image_transport https://github.com/ros-perception/image_transport_plugins
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f5571bb393c586db28f48f47a5ac6002
diff --git a/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2 b/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2
index 9b1d662b1754..4cb48f8f67db 100644
--- a/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2
+++ b/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/console_bridge-1.0.1
 DESCRIPTION=Wrapper around console_bridge
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/console_bridge-1.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros2/console_bridge_vendor/archive/1.2.2.tar.gz -> console_bridge_vendor-1.2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=831b782509b1ae07fe68f9133fffea78
diff --git a/metadata/md5-cache/dev-ros/console_bridge_vendor-9999 b/metadata/md5-cache/dev-ros/console_bridge_vendor-9999
index 56242b430e26..b7cef04b2a9e 100644
--- a/metadata/md5-cache/dev-ros/console_bridge_vendor-9999
+++ b/metadata/md5-cache/dev-ros/console_bridge_vendor-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/console_bridge-1.0.1
 DESCRIPTION=Wrapper around console_bridge
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/console_bridge-1.0.1
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=831b782509b1ae07fe68f9133fffea78
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.5.2 b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
index ecc0157d6ab6..45b2e1462b06 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.5.2
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_msgs/archive/1.5.2.tar.gz -> control_msgs-1.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_msgs-9999 b/metadata/md5-cache/dev-ros/control_msgs-9999
index 2459cf4f4b00..63bd24ef256e 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2 b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
index 3b41d165c2a4..ee0a06b77f77 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.18.2.tar.gz -> control_toolbox-1.18.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=66b9fff91bfe82c285fc7a6b337ddb65
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index c2a3f6cc078e..4558d5b59e8f 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -1,16 +1,16 @@
 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-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=66b9fff91bfe82c285fc7a6b337ddb65
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1 b/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
index ed0907110225..fe18d9bf3f05 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.2 b/metadata/md5-cache/dev-ros/controller_interface-0.19.2
index 56f232748a00..ced11e3b307a 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.3 b/metadata/md5-cache/dev-ros/controller_interface-0.19.3
index adafb133f729..8b3c99f613c0 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.3
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.4 b/metadata/md5-cache/dev-ros/controller_interface-0.19.4
index bbe265b92daf..dae5eb3cde9d 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.4
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e4f1a5e224f8a4d6a72eb8623759add4
diff --git a/metadata/md5-cache/dev-ros/controller_interface-9999 b/metadata/md5-cache/dev-ros/controller_interface-9999
index 68bb59ad338c..f79830c4df54 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-9999
@@ -1,16 +1,16 @@
 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-ros/hardware_interface dev-ros/pluginlib:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.4 b/metadata/md5-cache/dev-ros/controller_manager-0.19.4
index 635b3df36381..dffa770f700f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.4
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.4
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) 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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c25b5ad294b8ac0dd4e5fc9b500c2a2e
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index 76b3eb047518..0c9df1deefeb 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) 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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c25b5ad294b8ac0dd4e5fc9b500c2a2e
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
index 3c4f5e60743f..9f0b3b4ebf18 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
index cf25a78ab381..3df5e42dd7e8 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.3 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.3
index ff119448d454..17ffb5196155 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.3
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.4 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.4
index ddb927f01dd5..0579c1e3370c 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.4
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b9ef6df615823d818dee6ed937494132
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999 b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
index 81238498cce9..5700ad3a8bcc 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
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 76d0349e6032..8638c7925e78 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,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bbafac8f035225bb77b456e7b34e69b6
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
index b287b6a24158..a197cb05e603 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3
index 9e49e19e7a12..b70d83d7bc24 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.3
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4
index 8f20ff9e6f0c..0c5b2f3f3a77 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.4
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b65a569a7304c440ffaa4e14aa997032
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index a9ad77ee2bdc..5f09e1e7ef1f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
index 89665ccbba8d..01f58c4996f1 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=app-arch/unzip python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=app-arch/unzip python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.12.tar.gz -> convex_decomposition-0.1.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-9999 b/metadata/md5-cache/dev-ros/convex_decomposition-9999
index 3ac9b74cc378..1a02a9a5d3bc 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -1,16 +1,16 @@
 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=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=app-arch/unzip python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=app-arch/unzip python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1 b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
index 84a9273131b7..b6213108c43f 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz http://download.ros.org/data/costmap_2d/simple_driving_test_indexed.bag -> costmap_2d-1.17.0-simple_driving_test_indexed.bag http://download.ros.org/data/costmap_2d/willow-full-0.025.pgm -> costmap_2d-1.17.0-willow-full-0.025.pgm
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=39b02f2dcdf7bdfff6aa330189c87df8
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.17.1 b/metadata/md5-cache/dev-ros/costmap_2d-1.17.1
index 9be4570fbbcb..cf829732168d 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.17.1
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz http://download.ros.org/data/costmap_2d/simple_driving_test_indexed.bag -> costmap_2d-1.17.1-simple_driving_test_indexed.bag http://download.ros.org/data/costmap_2d/willow-full-0.025.pgm -> costmap_2d-1.17.1-willow-full-0.025.pgm
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=39b02f2dcdf7bdfff6aa330189c87df8
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index 7bc4e60e407b..47048d3540c4 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_sensor_msgs test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/laser_geometry dev-ros/message_filters >=dev-ros/pluginlib-1.13.0-r1 dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/costmap_2d/simple_driving_test_indexed.bag -> costmap_2d-9999-simple_driving_test_indexed.bag http://download.ros.org/data/costmap_2d/willow-full-0.025.pgm -> costmap_2d-9999-willow-full-0.025.pgm
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=39b02f2dcdf7bdfff6aa330189c87df8
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.7.2 b/metadata/md5-cache/dev-ros/cpp_common-0.7.2
index b4bdb4ea7d59..7ec32a73de8e 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.7.2
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cpp_common https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=574c0e74863867b299f9c1c2dfaa4eff
diff --git a/metadata/md5-cache/dev-ros/cpp_common-9999 b/metadata/md5-cache/dev-ros/cpp_common-9999
index 834096793ceb..52cf755844ae 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-9999
+++ b/metadata/md5-cache/dev-ros/cpp_common-9999
@@ -1,16 +1,16 @@
 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:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cpp_common https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=574c0e74863867b299f9c1c2dfaa4eff
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0-r1 b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0-r1
index d2e16ed1b753..257d8ac3bd13 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0-r1
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=14b2549ff56ae5d97952f98b7eae8ad5
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index a37d89a6d2c9..b3fa50ba1baf 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -1,16 +1,16 @@
 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/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] python_single_target_python3_8? ( dev-libs/boost:=[threads,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[threads,python,python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=14b2549ff56ae5d97952f98b7eae8ad5
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2 b/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
index 4ccba25bfc5d..cd86bade3af2 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depth_image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cec3f1a2bdea775d505e7abf1f6ab93
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.15.3 b/metadata/md5-cache/dev-ros/depth_image_proc-1.15.3
index f14f0c51d4a5..b92b53dada2e 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.15.3
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.15.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depth_image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2deb36afff8d3496685ab5605cbe7732
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-9999 b/metadata/md5-cache/dev-ros/depth_image_proc-9999
index 2d7a896d9ca1..a42e4f502763 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-9999
@@ -1,16 +1,16 @@
 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 media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depth_image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cec3f1a2bdea775d505e7abf1f6ab93
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 b7c72d4d774b..26ed122076c9 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,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _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 521110a5d6cb..c8f7526435a1 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,16 +1,16 @@
 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/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
index cb164bde318f..cfc9a67ecd71 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5557d08ee07d9e7fb755bb6100e61b15
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.2 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.2
index 44a306cd711b..fee6e3642689 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5557d08ee07d9e7fb755bb6100e61b15
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.3 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.3
index 652cc8c76b2d..58f69ed6a84a 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c57ac9cd2fa95baca82a79881edbc398
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.4 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.4
index 3797d5dfccdb..42ea806e542b 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c57ac9cd2fa95baca82a79881edbc398
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
index 20823dbf3a13..76f77a20d907 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
@@ -1,16 +1,16 @@
 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/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-libs/console_bridge:= dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5557d08ee07d9e7fb755bb6100e61b15
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
index 620a2217a31b..7c90cdb9c9d3 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.2 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.2
index cf81aa7dcff1..66280df7f31d 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.3 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.3
index d3279b1f0fbf..d86853b5071c 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bb7fa508d2cc39e238786d7b88baaa1f
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.4 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.4
index e4793414be85..d5359ced8386 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bb7fa508d2cc39e238786d7b88baaa1f
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
index 365df9347a09..c27fdf942a7e 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
index 15a5ea6062fa..488f273e567e 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999 b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
index 48b24575a084..33b1d7a207b1 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
@@ -1,16 +1,16 @@
 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/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
index fc5a90ab0dde..62af8c0f37f3 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.2 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.2
index 071e76a41f38..955cb575b09b 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.3 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.3
index 0894475e000c..c933b31deb65 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a920870a76311e2aa22f25710028548d
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.4 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.4
index 16750531abad..a607562e9d7d 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a920870a76311e2aa22f25710028548d
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
index b3aafcb0d2a6..2b7414a5a09f 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
index f4a4934348ff..bd8d62dbfb35 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
index 49cdb555eac2..c8c1ce8cef89 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
@@ -1,16 +1,16 @@
 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/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) app-admin/hddtemp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
index a927dec7ee9e..566289feed7a 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.1 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.1
index 1e885a27f411..50d72eefb7d3 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5399c49c6c98409872bc8aac7eef231e
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999 b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
index 9ead160b971c..3feb9869b307 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
index 1d2f28704aaa..26452dd0de78 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.2 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.2
index 26e033535bed..5c66e78ee600 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.2
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.3 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.3
index f3e3f6eff55d..277839e78bd9 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5dd2b9cc7681b9e7e323a5a2aa4de9ed
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.4 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.4
index 404764067c34..9e149624ace0 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5dd2b9cc7681b9e7e323a5a2aa4de9ed
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
index 56d12c59966d..c9391e1a256f 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
index cbb50aa83cfa..0efd7d07a46b 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-9999 b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
index 8e89c916c8c0..6e36ede4af28 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
@@ -1,16 +1,16 @@
 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/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/driver_base-1.6.8 b/metadata/md5-cache/dev-ros/driver_base-1.6.8
index 336232b3518c..6ff05cbd9ebb 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/driver_base-1.6.9 b/metadata/md5-cache/dev-ros/driver_base-1.6.9
index c850a2fbf710..29027eeafee8 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.9
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.9.tar.gz -> driver_common-1.6.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c252f2bd0c3d50bdf1ab3d621babd5b8
diff --git a/metadata/md5-cache/dev-ros/driver_base-9999 b/metadata/md5-cache/dev-ros/driver_base-9999
index 5c9b013dfefd..336e6ad3c41b 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -1,16 +1,16 @@
 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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
index 8c3e2f1f983e..2e170feb712f 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=affd31a6290d3ebb58c34263148d09d9
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.1 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.1
index 4d10580f03e8..9d901ff868de 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.1
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=affd31a6290d3ebb58c34263148d09d9
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-9999 b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
index cf9ca09b91a1..4aba9431d726 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -1,16 +1,16 @@
 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/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=affd31a6290d3ebb58c34263148d09d9
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
index 48c5ee4e1998..0af475829169 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.7.1.tar.gz -> dynamic_reconfigure-1.7.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9d06c3a9cb790443610144e2cfd79d01
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index fb4974f5e389..e6b7aedc09bf 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest dev-ros/roslaunch ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9d06c3a9cb790443610144e2cfd79d01
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2 b/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
index ca737bf94bd2..4a1b536e406d 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_conversions https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=06d257b5cf3b920e3549d99f9dc375c7
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-9999 b/metadata/md5-cache/dev-ros/eigen_conversions-9999
index c305b00f9979..bac133a251db 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-9999
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-9999
@@ -1,16 +1,16 @@
 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=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_conversions https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=06d257b5cf3b920e3549d99f9dc375c7
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
index e506049b0bd2..db66199c95d6 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz -> eigen_stl_containers-0.1.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=70b5caeb0dc427ad6b3d87326c2656b3
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999 b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
index 9385eba77920..75fa6b7a3428 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -1,16 +1,16 @@
 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-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=70b5caeb0dc427ad6b3d87326c2656b3
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.17.0 b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
index 2b9deabcf61e..37d2a77577f9 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.17.0
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.17.1 b/metadata/md5-cache/dev-ros/fake_localization-1.17.1
index 78d60d70b5cc..a3c6baf9adcf 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.17.1
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/fake_localization-9999 b/metadata/md5-cache/dev-ros/fake_localization-9999
index 52011d9d1960..6bfe7e7b2517 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-9999
+++ b/metadata/md5-cache/dev-ros/fake_localization-9999
@@ -1,16 +1,16 @@
 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:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/message_filters python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/filters-1.9.1 b/metadata/md5-cache/dev-ros/filters-1.9.1
index 3eed94eb7dec..0d8f0dee7b91 100644
--- a/metadata/md5-cache/dev-ros/filters-1.9.1
+++ b/metadata/md5-cache/dev-ros/filters-1.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/filters/archive/1.9.1.tar.gz -> filters-1.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=20027b0f1e30d6b0edb94721f9dab0ac
diff --git a/metadata/md5-cache/dev-ros/filters-9999 b/metadata/md5-cache/dev-ros/filters-9999
index e279b0c0ae6c..7bdca1fd973f 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -1,16 +1,16 @@
 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:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=20027b0f1e30d6b0edb94721f9dab0ac
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
index 028e293bc360..c47f99072e41 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-electronics/gazebo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-electronics/gazebo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.2 b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.2
index 18a496f8c212..ce691a8482df 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.2
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-electronics/gazebo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-electronics/gazebo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.2.tar.gz -> gazebo_ros_pkgs-2.9.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=24cca20212084dd351a539254a38bf18
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-9999 b/metadata/md5-cache/dev-ros/gazebo_dev-9999
index 8332e5ddefba..27ac8495d667 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -1,16 +1,16 @@
 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=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-electronics/gazebo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-electronics/gazebo python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
index 2afe82caf077..0637adf4492e 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.2 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.2
index 174257352879..796476ce32fc 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.2
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.2
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.2.tar.gz -> gazebo_ros_pkgs-2.9.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1b05adb5c7748744a8c20dd576ac0af1
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-9999 b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
index ddf63fe1ec8a..a23ec4b6b5bf 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
index 8edf0655381c..bbbf8bae5cf8 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f0ccc4f7cb1ff2271f58a164612487dc
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2
index 61f1577b5c4c..d7fd776d58d5 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.2.tar.gz -> gazebo_ros_pkgs-2.9.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c588caa10d686c329f33708621c9ea38
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 0dc64c9e431c..7f2a58b09869 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -1,16 +1,16 @@
 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/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/moveit_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/driver_base[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f0ccc4f7cb1ff2271f58a164612487dc
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
index 84df0934d75e..73d997cf7bb5 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=63f20d33cc4d6c3408bfd2bf368ea5d0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.2 b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.2
index 738f20660c2b..ffa32f1d7207 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.2
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.2.tar.gz -> gazebo_ros_pkgs-2.9.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dc5505143987ea38a62f89df857e424c
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index 548d081f153a..6f0a3b130858 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -1,16 +1,16 @@
 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/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=63f20d33cc4d6c3408bfd2bf368ea5d0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
index 93f02741595f..c496fe064ce4 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.2 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.2
index c02125f974e0..c1555d508f1c 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.2
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.2.tar.gz -> gazebo_ros_pkgs-2.9.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e65d02247d7bde6e3a1f2b68ebcb84df
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index bcb09ebe30ed..a2041ffeecb5 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,16 +1,16 @@
 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-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.6.5 b/metadata/md5-cache/dev-ros/gencpp-0.6.5
index 30eef381ecb6..8be7f75d8550 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.6.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gencpp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.5
 SRC_URI=https://github.com/ros/gencpp/archive/0.6.5.tar.gz -> gencpp-0.6.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cf5e45c38cc680d7b2b694291cc14b16
diff --git a/metadata/md5-cache/dev-ros/gencpp-9999 b/metadata/md5-cache/dev-ros/gencpp-9999
index d9bf77ddad9e..978b1381cf47 100644
--- a/metadata/md5-cache/dev-ros/gencpp-9999
+++ b/metadata/md5-cache/dev-ros/gencpp-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gencpp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cf5e45c38cc680d7b2b694291cc14b16
diff --git a/metadata/md5-cache/dev-ros/geneus-3.0.0-r1 b/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
index cab82b0c2498..0ab9b72d4b9f 100644
--- a/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
+++ b/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geneus https://github.com/jsk-ros-pkg/geneus
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/jsk-ros-pkg/geneus/archive/3.0.0.tar.gz -> geneus-3.0.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=07cd86823a52009f839f82d634ad4fd5
diff --git a/metadata/md5-cache/dev-ros/geneus-9999 b/metadata/md5-cache/dev-ros/geneus-9999
index e19d47f3ba09..0e53f0341c47 100644
--- a/metadata/md5-cache/dev-ros/geneus-9999
+++ b/metadata/md5-cache/dev-ros/geneus-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geneus https://github.com/jsk-ros-pkg/geneus
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=07cd86823a52009f839f82d634ad4fd5
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.18 b/metadata/md5-cache/dev-ros/genlisp-0.4.18
index 2cb8a606e77e..2592fc444b3c 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.18
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.18
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/0.4.18
 SRC_URI=https://github.com/ros/genlisp/archive/0.4.18.tar.gz -> genlisp-0.4.18.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0d47add50bf7b0d67d6e8cf4c8726141
diff --git a/metadata/md5-cache/dev-ros/genlisp-9999 b/metadata/md5-cache/dev-ros/genlisp-9999
index 4f1ea42d3db0..f06faf365cc2 100644
--- a/metadata/md5-cache/dev-ros/genlisp-9999
+++ b/metadata/md5-cache/dev-ros/genlisp-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0d47add50bf7b0d67d6e8cf4c8726141
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.16 b/metadata/md5-cache/dev-ros/genmsg-0.5.16
index e0ca36fc193b..1918fa3de5da 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.16
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.16
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python library for generating ROS message and service data structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/genmsg/archive/0.5.16.tar.gz -> genmsg-0.5.16.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1b256532efa7c4d61b391eadf6fe72fe
diff --git a/metadata/md5-cache/dev-ros/genmsg-9999 b/metadata/md5-cache/dev-ros/genmsg-9999
index 3afece5f0a7d..c167cb108607 100644
--- a/metadata/md5-cache/dev-ros/genmsg-9999
+++ b/metadata/md5-cache/dev-ros/genmsg-9999
@@ -1,16 +1,16 @@
 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=test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python library for generating ROS message and service data structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1b256532efa7c4d61b391eadf6fe72fe
diff --git a/metadata/md5-cache/dev-ros/gennodejs-2.0.1 b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
index b89a1bb0a01d..4b129f7e87cb 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-2.0.1
+++ b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gennodejs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1
 SRC_URI=https://github.com/RethinkRobotics-opensource/gennodejs/archive/2.0.1.tar.gz -> gennodejs-2.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=82a48fa628f3382d32a13341fa0a31e1
diff --git a/metadata/md5-cache/dev-ros/gennodejs-9999 b/metadata/md5-cache/dev-ros/gennodejs-9999
index e435d7f41614..8e161a79b440 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gennodejs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=82a48fa628f3382d32a13341fa0a31e1
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.11 b/metadata/md5-cache/dev-ros/genpy-0.6.11
index 52d97f9740eb..e420f1a8f556 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.11
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.11
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genpy
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.11
 SRC_URI=https://github.com/ros/genpy/archive/0.6.11.tar.gz -> genpy-0.6.11.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.14 b/metadata/md5-cache/dev-ros/genpy-0.6.14
index 936269aba160..663e1bd5083f 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.14
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genpy
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.14
 SRC_URI=https://github.com/ros/genpy/archive/0.6.14.tar.gz -> genpy-0.6.14.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/genpy-9999 b/metadata/md5-cache/dev-ros/genpy-9999
index 88682f355112..2fbee20bae82 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genpy
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.5 b/metadata/md5-cache/dev-ros/geodesy-0.5.5
index da650a086284..81bd1d5c738f 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.5
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3e545964748af07d52bd5978719c80f3
diff --git a/metadata/md5-cache/dev-ros/geodesy-9999 b/metadata/md5-cache/dev-ros/geodesy-9999
index 813277626ee0..389e821f8093 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -1,16 +1,16 @@
 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/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyproj[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyproj[python_targets_python3_9(-)] ) dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3e545964748af07d52bd5978719c80f3
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
index 6672fc8077b4..7bb7d6ba5c9b 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-9999 b/metadata/md5-cache/dev-ros/geographic_msgs-9999
index 3a583c7de075..b9110f3af2ac 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
index d4505095850a..2e75582e7e4c 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
 INHERIT=flag-o-matic ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.2.tar.gz -> geometric_shapes-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e8cf35d853271fba7ee31b7762bf0023
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index f430d2cde7c2..91280cae4365 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -1,16 +1,16 @@
 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-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
 INHERIT=flag-o-matic ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	git-r3	b8e8c92aa5fe8df7187e466138eb4e52	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e8cf35d853271fba7ee31b7762bf0023
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0 b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
index d53b206be330..617d17d21042 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.1 b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.1
index 0e381c1af4e3..ba0b29d21763 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=87797a2409e319fbf7f1cd971495cb3a
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-9999 b/metadata/md5-cache/dev-ros/geometry_msgs-9999
index f0f2cdc0cbbb..8e00635cb7fb 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.17.0 b/metadata/md5-cache/dev-ros/global_planner-1.17.0
index d384b0865f62..9bac7eb15584 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.17.1 b/metadata/md5-cache/dev-ros/global_planner-1.17.1
index 53a0df507f12..bb47863abb50 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.17.1
+++ b/metadata/md5-cache/dev-ros/global_planner-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/global_planner-9999 b/metadata/md5-cache/dev-ros/global_planner-9999
index 7809b740dfe8..7967e8cc766f 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -1,16 +1,16 @@
 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/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.4.2 b/metadata/md5-cache/dev-ros/gmapping-1.4.2
index 30f3d8c54236..7e7ebf7eb422 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.4.2
+++ b/metadata/md5-cache/dev-ros/gmapping-1.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet dev-ros/nav_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.2.tar.gz -> slam_gmapping-1.4.2.tar.gz test? ( http://download.ros.org/data/gmapping/basic_localization_stage_indexed.bag -> gmapping-1.4.2-basic_localization_stage_indexed.bag http://download.ros.org/data/gmapping/hallway_slow_2011-03-04-21-41-33.bag -> gmapping-1.4.2-hallway_slow_2011-03-04-21-41-33.bag http://download.ros.org/data/gmapping/basic_localization_stage_groundtruth.pgm -> gmapping-1.4.2-basic_localization_stage_groundtruth.pgm https://github.com/ros-perception/slam_gmapping_test_data/raw/master/test_replay_crash.bag -> gmapping-1.4.2-test_replay_crash.bag https://github.com/ros-perception/slam_gmapping_test_data/raw/master/test_turtlebot.bag -> gmapping-1.4.2-test_turtlebot.bag https://github.com/ros-perception/slam_gmapping_test_data/raw/master/test_upside_down.bag -> gmapping-1.4.2-test_upside_down.bag )
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f259aeb0a7f8970590d97ee42dc8187a
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index bf81556c8f65..f92c7d586820 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -1,17 +1,17 @@
 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:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet dev-ros/nav_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/nodelet python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( http://download.ros.org/data/gmapping/basic_localization_stage_indexed.bag -> gmapping-9999-basic_localization_stage_indexed.bag http://download.ros.org/data/gmapping/hallway_slow_2011-03-04-21-41-33.bag -> gmapping-9999-hallway_slow_2011-03-04-21-41-33.bag http://download.ros.org/data/gmapping/basic_localization_stage_groundtruth.pgm -> gmapping-9999-basic_localization_stage_groundtruth.pgm https://github.com/ros-perception/slam_gmapping_test_data/raw/master/test_replay_crash.bag -> gmapping-9999-test_replay_crash.bag https://github.com/ros-perception/slam_gmapping_test_data/raw/master/test_turtlebot.bag -> gmapping-9999-test_turtlebot.bag https://github.com/ros-perception/slam_gmapping_test_data/raw/master/test_upside_down.bag -> gmapping-9999-test_upside_down.bag )
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f259aeb0a7f8970590d97ee42dc8187a
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
index ef29ba66ac77..cc56f92253f5 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.2 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
index f2f1a993caaf..1d59eaf522a4 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.3 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.3
index e706ab267ad2..553c37d6e293 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.3
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.4 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.4
index f99445e7c17f..48351a3c19c7 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.4
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0a75f722d3fb1d83c839e3803f760161
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index 85b15cd00358..180360cbe9b5 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -1,16 +1,16 @@
 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 test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1
index 647fc5001009..9eea883e5b27 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6d751238881dd797869ce4bc2aba58f4
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
index 0e2e3a69a1fd..92620ce6f860 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -1,16 +1,16 @@
 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 media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.5.1 b/metadata/md5-cache/dev-ros/hector_geotiff-0.5.1
index 1b79c47e609a..985f5409bfbe 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=77f0003319233143a564cfedcaf1bcf5
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-9999 b/metadata/md5-cache/dev-ros/hector_geotiff-9999
index c2288890d080..499ab3c7e402 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -1,16 +1,16 @@
 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/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=77f0003319233143a564cfedcaf1bcf5
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.1 b/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.1
index 673d41574cb3..ef5954185ccf 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_launch-0.5.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files for the hector_geotiff mapper
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_server python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_server python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d54b87399eda5ef651c723cc554bc41f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999
index ca7c4e8a6d63..ab177ca6e20d 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_launch-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files for the hector_geotiff mapper
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_server python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins dev-ros/hector_trajectory_server python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d54b87399eda5ef651c723cc554bc41f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
index 5b137d0ac92f..acfc4a629cc0 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.0 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.0
index 01285ec1cf13..223113dd6ec0 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=762dc2da08aab35167f095e7f23bab02
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1
index 41293a45ae15..4cdc0356c6fa 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=762dc2da08aab35167f095e7f23bab02
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
index b2bc04193a0f..46de9bd66f56 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -1,16 +1,16 @@
 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/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_geotiff 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1
index 1fccb3740f06..22cc838a614b 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=097236a64da572f4f226b97ab6ea439e
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
index 4cc26b90cb6b..472f1c7f22f9 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
@@ -1,16 +1,16 @@
 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-ros/tf dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
index 20f696a248ca..05c712116208 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for processing IMU messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.0 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.0
index 2372d16be7c8..ee6e4ae5b054 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for processing IMU messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f8a21cc233edc91962e2a76e73605a96
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1
index c24a67491823..1672a7207cf8 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for processing IMU messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f8a21cc233edc91962e2a76e73605a96
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-9999 b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
index 38e472a178f3..7e266f9c9c76 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -1,16 +1,16 @@
 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-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for processing IMU messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.4.1 b/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
index 9bcca70c9a7b..28020c09cec6 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.5.0 b/metadata/md5-cache/dev-ros/hector_map_server-0.5.0
index 6d334aacd8b9..20b909dc9bca 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=981df0031799a063b1b2725fe80bf1c7
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.5.1 b/metadata/md5-cache/dev-ros/hector_map_server-0.5.1
index 4d4641504934..5b3dd2468b2c 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=981df0031799a063b1b2725fe80bf1c7
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-9999 b/metadata/md5-cache/dev-ros/hector_map_server-9999
index eff50e7d3f6f..bd4d21250c72 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -1,16 +1,16 @@
 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-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1 b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
index cc35391629b0..6c5b7a9be3af 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.5.0 b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.0
index e706df5d3ef2..7642d1c415b9 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4f1a9b7a42c584537195510f906229b7
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1 b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1
index cc35cec0af4b..3727c87987da 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4f1a9b7a42c584537195510f906229b7
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-9999 b/metadata/md5-cache/dev-ros/hector_map_tools-9999
index 52e7a86ec71b..2e35d5b71424 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -1,16 +1,16 @@
 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/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1 b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
index 3d8a931ca6c4..7c35372e6a1c 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.5.0 b/metadata/md5-cache/dev-ros/hector_mapping-0.5.0
index 767f7d2c322b..6090550e27f9 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=46ff9c591fc447dc94ad9182e4054806
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.5.1 b/metadata/md5-cache/dev-ros/hector_mapping-0.5.1
index f0faf21e5d1b..f155bbb2e4bb 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=46ff9c591fc447dc94ad9182e4054806
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-9999 b/metadata/md5-cache/dev-ros/hector_mapping-9999
index 7bacfd00115e..c34a11706ead 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -1,16 +1,16 @@
 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-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
index 67658580a72e..dcef71a64cfa 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.0 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.0
index d07a4836b927..db256e054eaa 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e6db26598bdd927ab93f4e21a41cfafa
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1
index 3e82d9d32162..23905359dbcc 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e6db26598bdd927ab93f4e21a41cfafa
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999 b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
index 3487427d65ac..c55f9434846a 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -1,16 +1,16 @@
 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-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.1 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.1
index 7e6b330b982a..e76bc868a69e 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.5.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5120d8c09439a4c0ce80830857fd4e69
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index 72490607f330..f9479237c92a 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5120d8c09439a4c0ce80830857fd4e69
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
index 8f1e8f470317..74279673a1e5 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7e658ee7e44484c2c9a89267812b2472
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.4.0 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.4.0
index 48502510aa3c..ef2fb9561d03 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.4.0
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.4.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.4.0.tar.gz -> hector_localization-0.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=33f557acb771d35c60f522a339d10fc0
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
index 2c7165e0c2cd..82bf9fee91b5 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -1,16 +1,16 @@
 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/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d90fcc08383e793d7fdf87f1fb3256c1
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
index 9d63f103be18..6861e696005c 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a40d3b7b6eeef71184fd7c6fe8f399dc
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.4.0 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.4.0
index 18b24e0ebb15..7cdec12ba9b7 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.4.0
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.4.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.4.0.tar.gz -> hector_localization-0.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=40372fc77f2e6fb95d4d94708260448b
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
index dc64f3a8e852..7826a70e019f 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -1,16 +1,16 @@
 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/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fabbfad8e1eab30ede6e0257ae2ed725
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1
index 8985d1828f12..9ea29950dbae 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.5.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a94a66f5ba66d8bcb2ec0d0f1f81999e
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-9999 b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
index e5de6a30a022..634295e26a8b 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=af4bd6a8cf4132a83050d6be43cc1116
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
index 7ad60daa22cb..2777b63ce5c9 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.0 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.0
index 9c1f9b50bd43..ee0c36ab61f0 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.0
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.0.tar.gz -> hector_slam-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=32b7535850a4b5ed9046f5864d13c85d
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1
index 821bea98c2b3..b6f4efc9e983 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.5.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.5.1.tar.gz -> hector_slam-0.5.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=32b7535850a4b5ed9046f5864d13c85d
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999 b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
index a21635eefadf..3c1358b08828 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -1,16 +1,16 @@
 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-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
index 14f61441e8f1..ea77796d3901 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35fafcf5d2b4a2fbfd908f45c79c584a
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-9999 b/metadata/md5-cache/dev-ros/image_cb_detector-9999
index 50032eccb970..9ec9862aa1b1 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -1,16 +1,16 @@
 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/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35fafcf5d2b4a2fbfd908f45c79c584a
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.15.0-r1 b/metadata/md5-cache/dev-ros/image_geometry-1.15.0-r1
index 57cbb717e9f6..e5abdd3d3b3a 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.15.0-r1
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.15.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=157a0888af3920c1e5fe4250f1bd2f96
diff --git a/metadata/md5-cache/dev-ros/image_geometry-9999 b/metadata/md5-cache/dev-ros/image_geometry-9999
index f9ae53185452..ea1c38755a38 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -1,16 +1,16 @@
 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=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=157a0888af3920c1e5fe4250f1bd2f96
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.15.2-r1 b/metadata/md5-cache/dev-ros/image_proc-1.15.2-r1
index e408be2ec10a..879705237f18 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.2-r1
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.2-r1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/camera_calibration_parsers ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/camera_calibration_parsers ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3c3da06add0d5acc30fa1b9181297e13
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.15.3 b/metadata/md5-cache/dev-ros/image_proc-1.15.3
index 4b80e606dda3..8c73f7e9f0da 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.3
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.3
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/camera_calibration_parsers ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/camera_calibration_parsers ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eb73922c974fb463d4136ee75fb434bb
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index 984b99c4ebb4..f698d181b74c 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/camera_calibration_parsers ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/camera_calibration_parsers ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3c3da06add0d5acc30fa1b9181297e13
diff --git a/metadata/md5-cache/dev-ros/image_publisher-1.15.2 b/metadata/md5-cache/dev-ros/image_publisher-1.15.2
index 53d53753618c..e300d7061677 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.15.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_publisher https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b3e57918efd8fb2c61e22af78c3f5027
diff --git a/metadata/md5-cache/dev-ros/image_publisher-1.15.3 b/metadata/md5-cache/dev-ros/image_publisher-1.15.3
index afb3fd502141..790d9f969f85 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.15.3
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.15.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_publisher https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a16a7402275016fac82744ff46da763
diff --git a/metadata/md5-cache/dev-ros/image_publisher-9999 b/metadata/md5-cache/dev-ros/image_publisher-9999
index ec5885eaf165..6561328099ba 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -1,16 +1,16 @@
 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 media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_publisher https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b3e57918efd8fb2c61e22af78c3f5027
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.15.2 b/metadata/md5-cache/dev-ros/image_rotate-1.15.2
index 20cecca76e58..0a0cd49bef3a 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.15.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Rotates an image minimizing the angle between a vector and the camera frame
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_rotate https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a092722c2f32c7c28dceff7d2c3463e2
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.15.3 b/metadata/md5-cache/dev-ros/image_rotate-1.15.3
index 98daea9d60c6..ce7fbaf04dee 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.15.3
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.15.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Rotates an image minimizing the angle between a vector and the camera frame
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_rotate https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ce2f3718eae847a420bf2529bd2e84f5
diff --git a/metadata/md5-cache/dev-ros/image_rotate-9999 b/metadata/md5-cache/dev-ros/image_rotate-9999
index 996eb842b151..8c3ae2b0caae 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-9999
+++ b/metadata/md5-cache/dev-ros/image_rotate-9999
@@ -1,16 +1,16 @@
 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 media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Rotates an image minimizing the angle between a vector and the camera frame
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_rotate https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a092722c2f32c7c28dceff7d2c3463e2
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.12.0 b/metadata/md5-cache/dev-ros/image_transport-1.12.0
index f4c503a672c2..03907feaf871 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.12.0
+++ b/metadata/md5-cache/dev-ros/image_transport-1.12.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index 9a8ab38a766c..2ca4b636e2af 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -1,16 +1,16 @@
 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/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=68426ff5c3e79a02b1680501bf3b7b19
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
index 045b0bde9bcc..86b7fb8f9d35 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
+++ b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.3 b/metadata/md5-cache/dev-ros/image_view-1.15.3
index 1e16efc2ca97..ac088567a1f9 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.15.3
+++ b/metadata/md5-cache/dev-ros/image_view-1.15.3
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=84df8b260266676c672b3fb2f56aa7dc
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index 188151c5fb10..271f63221858 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,16 +1,16 @@
 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-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_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:3 media-libs/harfbuzz:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
index 716b42b88e80..293a599419c5 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_complementary_filter https://github.com/ccny-ros-pkg/imu_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c62e875d19cf311b6955b02a2d4dc422
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999 b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
index db8357acb905..9b9ca2b81e55 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_complementary_filter https://github.com/ccny-ros-pkg/imu_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c62e875d19cf311b6955b02a2d4dc422
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
index 89c183573d31..4390eccaead9 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=15365db44e6f882eeddaad7abe1418bc
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
index 9dbf244b1396..5c11180f9b55 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
@@ -1,16 +1,16 @@
 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-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Fuses angular velocities, accelerations, and magnetic readings from an IMU
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_filter_madgwick https://github.com/ccny-ros-pkg/imu_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/nodelet dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/message_filters dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=15365db44e6f882eeddaad7abe1418bc
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.3.0 b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
index a5c279282e63..db50097fe790 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_processors-9999 b/metadata/md5-cache/dev-ros/imu_processors-9999
index daea3b31f9ba..207adbcbd711 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -1,16 +1,16 @@
 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-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0 b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
index 1c07394e0eb6..dabd4812d3ff 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transforms sensor_msgs::Imu data from one frame into another
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6164d0e9c16941ca2888a612b91f9c69
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-9999 b/metadata/md5-cache/dev-ros/imu_transformer-9999
index ea0b73ab6671..d997f678d862 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -1,16 +1,16 @@
 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/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transforms sensor_msgs::Imu data from one frame into another
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6164d0e9c16941ca2888a612b91f9c69
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
index d3e595067c95..967401a129c6 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interactive marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c65cea054bfd871b0d3a59bd066b7cc1
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
index f0db11f909cf..8f6fb9328218 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -1,16 +1,16 @@
 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-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interactive marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c65cea054bfd871b0d3a59bd066b7cc1
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1 b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
index 8e5c0489aa44..6f647058586e 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.12.0.tar.gz -> interactive_markers-1.12.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47bb9f8f3462fa315ec17f8525052db7
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-9999 b/metadata/md5-cache/dev-ros/interactive_markers-9999
index 249b319125af..d1b274b24c03 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -1,16 +1,16 @@
 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/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47bb9f8f3462fa315ec17f8525052db7
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14 b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
index 61f709496d1b..ef0bd2b6e093 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tools for calculating the intersection of interval messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ad95ea37746528400822a99b2297f69
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-9999 b/metadata/md5-cache/dev-ros/interval_intersection-9999
index 5612645862a7..978d7fed0d6a 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-9999
+++ b/metadata/md5-cache/dev-ros/interval_intersection-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tools for calculating the intersection of interval messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ad95ea37746528400822a99b2297f69
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.7 b/metadata/md5-cache/dev-ros/ivcon-0.1.7
index 6d94cdb5f85a..8302d7bfae7b 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.7
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Mesh Conversion Utility
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ivcon/archive/0.1.7.tar.gz -> ivcon-0.1.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/ivcon-9999 b/metadata/md5-cache/dev-ros/ivcon-9999
index 24ac5851c6b9..a84c7e52b709 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Mesh Conversion Utility
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
index afd60ffce338..a17792dab52f 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
index 8dfca1465b2f..638ec535df3e 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.3 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.3
index dcf1abfc5d27..6a3d48844281 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.3
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.4 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.4
index 11feacb19698..adac0611d673 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.4
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ba839175ce84182a8f9e0ef466e5f21
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-9999 b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
index 0f58b1063f3a..9058e27d8fbb 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
@@ -1,16 +1,16 @@
 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-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
index d1c3221b0044..e27018b36ac6 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cffdd16933ddc1f0b5c2e1c138118ef0
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
index 9bfac373f11e..70d549fef3f3 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
@@ -1,16 +1,16 @@
 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=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cffdd16933ddc1f0b5c2e1c138118ef0
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0 b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
index 2bab797237d7..5d3c281c5a50 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/joint_state_publisher[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76e62518131d50558df462f55bfda05a
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
index bf7ad7a82de5..5bde7a8365e7 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
@@ -1,16 +1,16 @@
 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=test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/joint_state_publisher[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76e62518131d50558df462f55bfda05a
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14 b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
index 8523a3902473..9f0e304fcdce 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_states_settler https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0458f74ed7a8d91c2ac758a74eedca96
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-9999 b/metadata/md5-cache/dev-ros/joint_states_settler-9999
index f63f53c1e6c2..3aac77f806ce 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-9999
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/actionlib_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_states_settler https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0458f74ed7a8d91c2ac758a74eedca96
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2 b/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
index 4931165a210e..050090b5ec01 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_conversions https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5bfa7082a473c3cda915209c84bc2b03
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-9999 b/metadata/md5-cache/dev-ros/kdl_conversions-9999
index 0f3c2f85f205..d647315df7c2 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-9999
@@ -1,16 +1,16 @@
 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=sci-libs/orocos_kdl:= dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_conversions https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5bfa7082a473c3cda915209c84bc2b03
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.14.1 b/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
index d462ec2b86ba..ec9126625373 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.1.tar.gz -> kdl_parser-1.14.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a8ff9a976196a39a4b3e8070fcca7a93
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-9999 b/metadata/md5-cache/dev-ros/kdl_parser-9999
index ffca7470a921..57eb7ff02243 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -1,16 +1,16 @@
 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:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a8ff9a976196a39a4b3e8070fcca7a93
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
index 8d1288d055fa..81e1e7245d4f 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.1.tar.gz -> kdl_parser-1.14.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fbdd8985165c236bdae3cc72ac2f52ea
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index b1c01b29a987..dbad7e12c29a 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/urdf_parser_py[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/urdf_parser_py[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fbdd8985165c236bdae3cc72ac2f52ea
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
index 812088b80a25..1f6ee1dbb5d3 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
@@ -1,17 +1,17 @@
 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/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.8.tar.gz -> laser_assembler-1.7.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64281a7d918a2cc3e4e168982e57b81b
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-9999 b/metadata/md5-cache/dev-ros/laser_assembler-9999
index 436314c47417..a496107e2060 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -1,16 +1,16 @@
 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/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/filters python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64281a7d918a2cc3e4e168982e57b81b
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 401089227fea..3c1651210522 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,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 media-libs/opencv[png] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 media-libs/opencv[png] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bc0394f15c6fe404392800da41846909
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index 715ced587993..5938fbdad52f 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 media-libs/opencv[png] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 media-libs/opencv[png] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bc0394f15c6fe404392800da41846909
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 ff14f224b996..240e57b9ae79 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index b88a035eaf91..1bfa9d0379e3 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,16 +1,16 @@
 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-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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.6 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.6
index 3187f4f9b795..1613fe59c9cf 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.6
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.6.tar.gz -> laser_geometry-1.6.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3d5b0465684ebbfb4e0c1e9e09575613
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-9999 b/metadata/md5-cache/dev-ros/laser_geometry-9999
index 4da0341da246..889eadcbf832 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a373d09fbb82d26dba6a223d4d6dc078
diff --git a/metadata/md5-cache/dev-ros/laser_proc-0.1.6 b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
index 6d7b066a3926..5516f1880a82 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.6
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_proc/archive/0.1.6.tar.gz -> laser_proc-0.1.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/laser_proc-9999 b/metadata/md5-cache/dev-ros/laser_proc-9999
index 95d0b61d5ce4..481ea90169df 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -1,16 +1,16 @@
 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-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.2.0 b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
index 60037a895588..4eaaaf77f9a0 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-1.2.0
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ffc733eb9f883c4dd3f64af83418ea5
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.4.0 b/metadata/md5-cache/dev-ros/libmavconn-1.4.0
index 20926e3d39ba..93261d115657 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-1.4.0
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.4.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ffc733eb9f883c4dd3f64af83418ea5
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.5.2 b/metadata/md5-cache/dev-ros/libmavconn-1.5.2
index 4803f2fff61f..3967bd38470f 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-1.5.2
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.5.2.tar.gz -> mavros-1.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7f8b0a38b4d9fac586d3a69d601484de
diff --git a/metadata/md5-cache/dev-ros/libmavconn-9999 b/metadata/md5-cache/dev-ros/libmavconn-9999
index 3e5655bb8584..a01ab22da8f4 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -1,16 +1,16 @@
 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/mavlink-gbp-release-2016.7.7 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ffc733eb9f883c4dd3f64af83418ea5
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
index 80fa3d09b19e..7dac72e38be8 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tutorial showing how to build a C++ program with RViz displays and features
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/librviz_tutorial https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=89c98a2af4114c4e6738b01d90c21ef3
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-9999 b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
index 8cfacc93c934..2a2aac417311 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
@@ -1,16 +1,16 @@
 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-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tutorial showing how to build a C++ program with RViz displays and features
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/librviz_tutorial https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=89c98a2af4114c4e6738b01d90c21ef3
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.14.1 b/metadata/md5-cache/dev-ros/map_msgs-1.14.1
index ffe9830bcf8e..1870dbdad5f6 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-1.14.1
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.14.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.1.tar.gz -> navigation_msgs-1.14.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2618e2cfcc5b8cf85ae3e950cef18bed
diff --git a/metadata/md5-cache/dev-ros/map_msgs-9999 b/metadata/md5-cache/dev-ros/map_msgs-9999
index 9fd328592b95..b6b6e2966637 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7d9902613bec184d432f057ce4dd8eb2
diff --git a/metadata/md5-cache/dev-ros/map_server-1.17.0 b/metadata/md5-cache/dev-ros/map_server-1.17.0
index 4b4746245598..a7c4ffe25aac 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.17.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5c5fe820ba77b7da2b52b8302d97cf0a
diff --git a/metadata/md5-cache/dev-ros/map_server-1.17.1 b/metadata/md5-cache/dev-ros/map_server-1.17.1
index e71c87d235de..08c867723805 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.17.1
+++ b/metadata/md5-cache/dev-ros/map_server-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5c5fe820ba77b7da2b52b8302d97cf0a
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index 2d90e547202d..65587afe9080 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -1,16 +1,16 @@
 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=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit dev-cpp/gtest ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5c5fe820ba77b7da2b52b8302d97cf0a
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
index 7c2071cd1793..426e88f4186a 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink message marshaling library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.9.10-2020.9.10.tar.gz -> mavlink-gbp-release-2020.9.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=aaa5240aa2874d27cc1890ee7da112f6
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2
index 2fc7a8b1fbda..d0f9d3daa2ac 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2021.2.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink message marshaling library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2021.2.2-2021.2.2.tar.gz -> mavlink-gbp-release-2021.2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ead031205dc530c21dd167bd8019cdec
diff --git a/metadata/md5-cache/dev-ros/mavros-1.2.0 b/metadata/md5-cache/dev-ros/mavros-1.2.0
index c00ababd34f6..ebb54efe6be0 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros-1.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.2.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.2.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros-1.4.0 b/metadata/md5-cache/dev-ros/mavros-1.4.0
index a6d4e2c15032..45e5c01936cf 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.4.0
+++ b/metadata/md5-cache/dev-ros/mavros-1.4.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.4.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.4.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb00de4bc210d67dd2402b4312493b38
diff --git a/metadata/md5-cache/dev-ros/mavros-1.5.2 b/metadata/md5-cache/dev-ros/mavros-1.5.2
index 91cfcf4049a7..7c59842e1267 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.5.2
+++ b/metadata/md5-cache/dev-ros/mavros-1.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.5.2[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.5.2[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.5.2.tar.gz -> mavros-1.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5d06a7a33376405f750226463f0faeed
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index 33a0ab70ea8c..e0a0747c2940 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,16 +1,16 @@
 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/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb00de4bc210d67dd2402b4312493b38
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0 b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
index c985f366b030..bc99f09de8ec 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.4.0 b/metadata/md5-cache/dev-ros/mavros_extras-1.4.0
index a4c91b7a9f36..9d7b00c0ea6f 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-1.4.0
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.4.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.5.2 b/metadata/md5-cache/dev-ros/mavros_extras-1.5.2
index 9ca0cdf40d62..f6a1db8ba30c 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-1.5.2
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.5.2.tar.gz -> mavros-1.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e1e020422c6a906db1260110bb20e4ba
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index 0bf20fa9906d..87296ec2d0df 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -1,16 +1,16 @@
 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/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a32bca61b73d165ce652a5e91bb039c0
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 491308b872d5..301ab97d5e14 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0
index 79a8fdf6e048..5726d127e838 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.5.2 b/metadata/md5-cache/dev-ros/mavros_msgs-1.5.2
index e7e53bb0feae..25056570365d 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.5.2
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.5.2
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.5.2.tar.gz -> mavros-1.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=89e8175e8ace04e1d01a8cd63f1e7d21
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index 772aef6e536c..ca086ec9d63b 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/media_export-0.3.0 b/metadata/md5-cache/dev-ros/media_export-0.3.0
index 65577ca629ca..1f785b782980 100644
--- a/metadata/md5-cache/dev-ros/media_export-0.3.0
+++ b/metadata/md5-cache/dev-ros/media_export-0.3.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Allow ROS packages to export media paths to each other
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/media_export/archive/0.3.0.tar.gz -> media_export-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/media_export-9999 b/metadata/md5-cache/dev-ros/media_export-9999
index 04594114deed..5b6960ec2c46 100644
--- a/metadata/md5-cache/dev-ros/media_export-9999
+++ b/metadata/md5-cache/dev-ros/media_export-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Allow ROS packages to export media paths to each other
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.10 b/metadata/md5-cache/dev-ros/message_filters-1.15.10
index d2336833da8d..195f06291dca 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.10
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=af87f564ca8072e8843331a93105c385
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.8 b/metadata/md5-cache/dev-ros/message_filters-1.15.8
index 45e8a584e3c0..eed58fccfdda 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.8
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=455d5436cef5de9cba345a36f4199797
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.9 b/metadata/md5-cache/dev-ros/message_filters-1.15.9
index a6a23d1844d0..b8039ac53cfe 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.9
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=455d5436cef5de9cba345a36f4199797
diff --git a/metadata/md5-cache/dev-ros/message_filters-9999 b/metadata/md5-cache/dev-ros/message_filters-9999
index d360490a0e8d..43eaff1f6f1f 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-9999
@@ -1,16 +1,16 @@
 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/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=455d5436cef5de9cba345a36f4199797
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.4.1 b/metadata/md5-cache/dev-ros/message_generation-0.4.1
index 96119ea4b9b5..bae37df3d09d 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.1
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/message_generation/archive/0.4.1.tar.gz -> message_generation-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_generation-9999 b/metadata/md5-cache/dev-ros/message_generation-9999
index 64e750ad7e9f..e9072b382ea1 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -1,16 +1,16 @@
 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/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_runtime-0.4.13 b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
index 5109f6871604..7126129d67a5 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.13
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/message_runtime/archive/0.4.13.tar.gz -> message_runtime-0.4.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_runtime-9999 b/metadata/md5-cache/dev-ros/message_runtime-9999
index 21f15056e74f..4bb52c4bc0c6 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0 b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
index 79bffff49fe5..f28d156abf0d 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Translates pose information from different kind of common message types to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.4.0 b/metadata/md5-cache/dev-ros/message_to_tf-0.4.0
index 940d833b8952..9d0e3338a458 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.4.0
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.4.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Translates pose information from different kind of common message types to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.4.0.tar.gz -> hector_localization-0.4.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a3739497c923a1f25a55b3d36538b570
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-9999 b/metadata/md5-cache/dev-ros/message_to_tf-9999
index d56a3ac2624a..9cad510448df 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -1,16 +1,16 @@
 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/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Translates pose information from different kind of common message types to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.5 b/metadata/md5-cache/dev-ros/mk-1.15.5
index 6d8954c89b2f..ea1d1b704d88 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.5
+++ b/metadata/md5-cache/dev-ros/mk-1.15.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.6 b/metadata/md5-cache/dev-ros/mk-1.15.6
index 93ae3dfe1e54..d731924803ce 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.6
+++ b/metadata/md5-cache/dev-ros/mk-1.15.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.7 b/metadata/md5-cache/dev-ros/mk-1.15.7
index 9e77df71c7a9..50d677134759 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.7
+++ b/metadata/md5-cache/dev-ros/mk-1.15.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-9999 b/metadata/md5-cache/dev-ros/mk-9999
index 52c2be6a67dd..6b71af958b6f 100644
--- a/metadata/md5-cache/dev-ros/mk-9999
+++ b/metadata/md5-cache/dev-ros/mk-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mk https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14 b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
index a6a30bb13bdb..9dbc5f3d600d 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/monocam_settler https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9052ec866e058fb137edf6861a70c3d0
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-9999 b/metadata/md5-cache/dev-ros/monocam_settler-9999
index 6026c0b5648a..99462662e577 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-9999
+++ b/metadata/md5-cache/dev-ros/monocam_settler-9999
@@ -1,16 +1,16 @@
 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/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/monocam_settler https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9052ec866e058fb137edf6861a70c3d0
diff --git a/metadata/md5-cache/dev-ros/move_base-1.17.0 b/metadata/md5-cache/dev-ros/move_base-1.17.0
index 765c50c049b0..d9b780692ec7 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.17.0
+++ b/metadata/md5-cache/dev-ros/move_base-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base-1.17.1 b/metadata/md5-cache/dev-ros/move_base-1.17.1
index 56495c533358..95c73a788a18 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.17.1
+++ b/metadata/md5-cache/dev-ros/move_base-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index 16825d65d26d..e44b68acd9ee 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -1,16 +1,16 @@
 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/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.1 b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.1
index 4a842aec0e86..dfd3a2b9b6b0 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.1
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.1.tar.gz -> navigation_msgs-1.14.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d166ae0e7712dee9701606dbce929b33
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-9999 b/metadata/md5-cache/dev-ros/move_base_msgs-9999
index 110e20d26e70..c46072a7d7f0 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=06c2a20a66b87f8c7ad0efdb6dc4846c
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
index 490a704fb75f..749b02b63149 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.1 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.1
index 54be2102463b..5b43feffe0bc 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.1
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999 b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
index cd296fdd09d5..337625424a57 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -1,16 +1,16 @@
 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/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
index 125d2dbf2023..3455cf5e0c67 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.11.1.tar.gz -> moveit_msgs-0.11.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-9999 b/metadata/md5-cache/dev-ros/moveit_msgs-9999
index 3679fe0d7c61..a3e704c44596 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.17.0 b/metadata/md5-cache/dev-ros/nav_core-1.17.0
index 005605707e2a..e109d102387d 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.17.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.17.1 b/metadata/md5-cache/dev-ros/nav_core-1.17.1
index 061c94e8cf7b..a746cb9ce874 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.17.1
+++ b/metadata/md5-cache/dev-ros/nav_core-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_core-9999 b/metadata/md5-cache/dev-ros/nav_core-9999
index d254c866b36e..deb8664a1508 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -1,16 +1,16 @@
 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/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0 b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
index 7feb2e560c24..88b3969aa058 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.13.1 b/metadata/md5-cache/dev-ros/nav_msgs-1.13.1
index e656a4859cfb..c600916349b4 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=be9895be0ea10a864b34c0c29a0e6efa
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-9999 b/metadata/md5-cache/dev-ros/nav_msgs-9999
index 9856433a46cd..2f6cb846107f 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/navfn-1.17.0 b/metadata/md5-cache/dev-ros/navfn-1.17.0
index 0a990e23fa51..005d39763630 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.17.0
+++ b/metadata/md5-cache/dev-ros/navfn-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/navfn-1.17.1 b/metadata/md5-cache/dev-ros/navfn-1.17.1
index e8d8bad43714..3e69cb79964e 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.17.1
+++ b/metadata/md5-cache/dev-ros/navfn-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index dd729717210c..c36aac17e473 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -1,16 +1,16 @@
 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/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0 b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
index 903898877559..e977b3fe30d2 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages related to data in the NMEA format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/nmea_msgs/archive/1.1.0.tar.gz -> nmea_msgs-1.1.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-9999 b/metadata/md5-cache/dev-ros/nmea_msgs-9999
index 8d295610c97f..29fafd148aa8 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages related to data in the NMEA format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1 b/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
index 84ca0eab82f0..e663d9d7246f 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
+++ b/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Runs multiple algorithms in the same process with zero copy transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=06887e16bc3bd0263ec44d43e74a6faf
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.10.1 b/metadata/md5-cache/dev-ros/nodelet-1.10.1
index f4c733a9e240..9b2616dd10bf 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.10.1
+++ b/metadata/md5-cache/dev-ros/nodelet-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Runs multiple algorithms in the same process with zero copy transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.1.tar.gz -> nodelet_core-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6f04603da3a480d6d36e35e41035680b
diff --git a/metadata/md5-cache/dev-ros/nodelet-9999 b/metadata/md5-cache/dev-ros/nodelet-9999
index bf704881a49a..20a1238443f7 100644
--- a/metadata/md5-cache/dev-ros/nodelet-9999
+++ b/metadata/md5-cache/dev-ros/nodelet-9999
@@ -1,16 +1,16 @@
 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/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Runs multiple algorithms in the same process with zero copy transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-ros/class_loader:= dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=06887e16bc3bd0263ec44d43e74a6faf
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
index e27b187a4824..d693d1dfda42 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_topic_tools https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=962551d30beb45ce589288347b0a18d3
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.1 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.1
index 14924ea155db..9b20f3d1fe70 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.1
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_topic_tools https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.1.tar.gz -> nodelet_core-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=10d24d7ffb6b97623e3d8f228523683b
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
index d4e674ad3955..457da4c886da 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
@@ -1,16 +1,16 @@
 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/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_topic_tools https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=962551d30beb45ce589288347b0a18d3
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
index 7b4cb6ef0f95..9aa429c0cbcb 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
index 703eb98fa5ed..a67f799c4abd 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
index 0b0fd6f969f1..47d9ff1a0ea1 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
@@ -1,16 +1,16 @@
 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/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2 b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2
index dd214db8b310..8d034948bb83 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/object_recognition_msgs https://github.com/wg-perception/object_recognition_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wg-perception/object_recognition_msgs/archive/0.4.2.tar.gz -> object_recognition_msgs-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999 b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
index c91593d0ef63..8e4415568d38 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/object_recognition_msgs https://github.com/wg-perception/object_recognition_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
index d55d79261fa3..f6eabcbb7f91 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.5.tar.gz -> octomap_msgs-0.3.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-9999 b/metadata/md5-cache/dev-ros/octomap_msgs-9999
index d31f405a892f..d92cf004b5dc 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1 b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
index d24ce56d1dcc..01b1fd0c41d0 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_ros/archive/0.4.1.tar.gz -> octomap_ros-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-9999 b/metadata/md5-cache/dev-ros/octomap_ros-9999
index e4e99864f019..1a91333fde1d 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -1,16 +1,16 @@
 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/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.2 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
index b48cea835ed8..3cb158da35ce 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/image_view ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/image_view ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.2.tar.gz -> opencv_apps-2.0.2.tar.gz http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> opencv_apps-2.0.2-face_detector_withface_test_diamondback.bag http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> opencv_apps-2.0.2-vslam_tutorial.bag
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76277f9ccf36ea327842ac64cbabac76
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index 6afb373823fb..c9f84c47b5b4 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/image_view ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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 dev-ros/image_view ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> opencv_apps-9999-face_detector_withface_test_diamondback.bag http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> opencv_apps-9999-vslam_tutorial.bag
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76277f9ccf36ea327842ac64cbabac76
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0 b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
index 31d35aff2bea..9bbabf21867f 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cc0f3e3487d5f637737b0c38750155f4
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-9999 b/metadata/md5-cache/dev-ros/opencv_tests-9999
index 20f92d06e1cb..31b64dd25dc8 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -1,16 +1,16 @@
 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[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( media-libs/opencv[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( media-libs/opencv[python,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cc0f3e3487d5f637737b0c38750155f4
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2 b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
index 073f523677c4..e96c5cf6492c 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ac228684ed4d61c4a9a9369c0d96fe62
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-9999 b/metadata/md5-cache/dev-ros/openni2_camera-9999
index 0c8b384de9c6..7156a86e596e 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -1,16 +1,16 @@
 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/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ac228684ed4d61c4a9a9369c0d96fe62
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2 b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
index 32d59975ff3d..05b0c2cdf71b 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index e111e04003a6..54394dde63e0 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -1,16 +1,16 @@
 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/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
index 67a374d07ac2..6fcd553dae3c 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.2.1.tar.gz -> openslam_gmapping-0.2.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5cf2310e583b7ceba65dca448a3c274f
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-9999 b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
index 421b3f3e3a66..31fdc16d86ae 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5cf2310e583b7ceba65dca448a3c274f
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
index 93f88e17f805..ab9cad5717f8 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2
index 99dd8b5b722e..8bbe96050ed3 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.2.tar.gz -> perception_pcl-1.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index 165817f24f00..3a4deab9b2e5 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -1,16 +1,16 @@
 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 sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0 b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
index b97930efa6ea..2424dddb1428 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pcl_msgs/archive/0.3.0.tar.gz -> pcl_msgs-0.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-9999 b/metadata/md5-cache/dev-ros/pcl_msgs-9999
index ac573a1905cb..7e7c49d8aff6 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.7.2 b/metadata/md5-cache/dev-ros/pcl_ros-1.7.2
index c7a093c2bcea..9f097cbe37d4 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.7.2
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.2.tar.gz -> perception_pcl-1.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0947f0384e314c7cd32d4052fa4b4946
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index 8b0346520d65..a5d4dc2d5658 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,16 +1,16 @@
 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-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0947f0384e314c7cd32d4052fa4b4946
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2 b/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
index 595fa6ba6e6b..f5db12d48132 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for writing and dynamically loading plugins using the ROS infrastructure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/1.13.0
 SRC_URI=https://github.com/ros/pluginlib/archive/1.13.0.tar.gz -> pluginlib-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1decdd9291df781fc091c6cfd282c97c
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index 88cda9ab618d..72352cf0e15a 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -1,16 +1,16 @@
 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/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for writing and dynamically loading plugins using the ROS infrastructure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/tinyxml2:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1decdd9291df781fc091c6cfd282c97c
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
index 1022ac8b1aaa..b99ff4a6a385 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
index 0d90a7aa9580..47a55ee96f24 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
index b83fd26bd957..60f1593edde3 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
@@ -1,16 +1,16 @@
 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/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-1.2.0 b/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
index 5341dbf86b5b..5781c2491fec 100644
--- a/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
+++ b/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=CMake shim over the poco library
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0
 RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/ros2/poco_vendor/archive/1.2.0.tar.gz -> poco_vendor-1.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=dbff2d50781ba4b78191e465efc1536b
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-9999 b/metadata/md5-cache/dev-ros/poco_vendor-9999
index 9f76630020fb..6640ccc33a14 100644
--- a/metadata/md5-cache/dev-ros/poco_vendor-9999
+++ b/metadata/md5-cache/dev-ros/poco_vendor-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_cmake_copyright dev-ros/ament_cmake_lint_cmake dev-ros/ament_cmake_xmllint dev-ros/ament_cmake_test ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_cmake_copyright dev-ros/ament_cmake_lint_cmake dev-ros/ament_cmake_xmllint dev-ros/ament_cmake_test ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=CMake shim over the poco library
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=32d157f0dad8a0fa3aca039e065b7f93
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
index 5d44701ef6b6..3ef2efe6a1d7 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pointcloud_to_laserscan/archive/1.4.1.tar.gz -> pointcloud_to_laserscan-1.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f2388eefb2c335e8a3e6d5953335c3ec
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
index 8e34d84a3634..82e929dd9c28 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -1,16 +1,16 @@
 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/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f2388eefb2c335e8a3e6d5953335c3ec
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.12.0 b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
index 81b7a1dc1beb..1b8a6d03c9c8 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.12.0
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=C++ classes for implementing a polled camera driver node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/polled_camera-9999 b/metadata/md5-cache/dev-ros/polled_camera-9999
index a91f931577c1..4dd02c756b9b 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -1,16 +1,16 @@
 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-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=C++ classes for implementing a polled camera driver node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
index 92bd9d42f648..fcf47ce89eeb 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eaeb26ef6577acc6afe1141b325f73e1
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.13.0 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.13.0
index ab69646dff8c..1d211bbd3bff 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.13.0
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.13.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.13.0.tar.gz -> pr2_common-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eaeb26ef6577acc6afe1141b325f73e1
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
index 1f271ae0e791..68bc18b69a5b 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eaeb26ef6577acc6afe1141b325f73e1
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.4 b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
index 7d47b24d82ba..a4cc74c44be0 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.13.0 b/metadata/md5-cache/dev-ros/pr2_description-1.13.0
index 9fdd18e40daa..69b308130a2d 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.13.0
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.13.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.13.0.tar.gz -> pr2_common-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index 706152e9e464..b6ce972b7bc0 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/convex_decomposition dev-ros/ivcon >=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/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/xacro[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-libs/urdfdom dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
index f21d073b1a91..986c46dfc7b7 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.13.0 b/metadata/md5-cache/dev-ros/pr2_machine-1.13.0
index d1ee5a639121..d9d12ae98bdf 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.13.0
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.13.0.tar.gz -> pr2_common-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-9999 b/metadata/md5-cache/dev-ros/pr2_machine-9999
index ad8ca9c14121..95f8f65def93 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
index a27bb65543bf..ef8269c10a67 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.13.0 b/metadata/md5-cache/dev-ros/pr2_msgs-1.13.0
index 152c8043ed14..56286fcff603 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.13.0.tar.gz -> pr2_common-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-9999 b/metadata/md5-cache/dev-ros/pr2_msgs-9999
index c0bdedc1b794..5ea46c06cc06 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0 b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
index e63a2f419913..36eba3244b7f 100644
--- a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
+++ b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=
 DESCRIPTION=CMake module with extra functionality for Python
@@ -12,5 +12,5 @@ RDEPEND=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros2/python_cmake_module/archive/0.8.0.tar.gz -> python_cmake_module-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9
 _md5_=7e27f11cf47df671ee202ce8f9aca5a2
diff --git a/metadata/md5-cache/dev-ros/python_cmake_module-9999 b/metadata/md5-cache/dev-ros/python_cmake_module-9999
index c40844ec40b0..8fda3075b5fb 100644
--- a/metadata/md5-cache/dev-ros/python_cmake_module-9999
+++ b/metadata/md5-cache/dev-ros/python_cmake_module-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 ros-meta/ament_cmake[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( ( dev-lang/python:3.8 ros-meta/ament_cmake[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ) test? ( dev-ros/ament_lint_auto ) || ( dev-lang/python:3.8 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=
 DESCRIPTION=CMake module with extra functionality for Python
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-any-r1	17241a11501065ff3651350040875aa9	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
 _md5_=7e27f11cf47df671ee202ce8f9aca5a2
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1 b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
index a393586c6d37..d97602633243 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.4.3.tar.gz -> python_qt_binding-0.4.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8690f843c8469772ca1adc02b252b643
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-9999 b/metadata/md5-cache/dev-ros/python_qt_binding-9999
index 03caa6b8e19a..1296acdc96c5 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -1,16 +1,16 @@
 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-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[gui,widgets,printsupport,python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8690f843c8469772ca1adc02b252b643
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
index 54922202e2b9..5c60c0499b67 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygraphviz[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygraphviz[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
index c6e87e85d832..515179e84120 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygraphviz[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygraphviz[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-9999 b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
index 98c5b1967ffa..e59aaa9f95cd 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-9999
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
@@ -1,16 +1,16 @@
 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-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygraphviz[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pygraphviz[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygraphviz[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/pydot[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pydot[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui-0.4.1
index 96c7a419d3b0..5a22dbfac7d8 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui-0.4.2
index 2319ae3f9e1b..f85cdc5ec2b4 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui-9999 b/metadata/md5-cache/dev-ros/qt_gui-9999
index 9efdfb3551c4..5b7ad59e69be 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui-9999
@@ -1,16 +1,16 @@
 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-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
index 62228551dd1f..4cc88f6c345e 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Instance of the integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
index 7eb2def83ee8..92c8343f2e6d 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Instance of the integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-9999 b/metadata/md5-cache/dev-ros/qt_gui_app-9999
index f31fa0546a96..7a90d5b4cfb4 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-9999
@@ -1,16 +1,16 @@
 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/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Instance of the integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_app https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
index 25fce65daf44..ef4523967e57 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=62e991395e57eab69cc4f93edad58785
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index a18d617086b0..96b8727cdd56 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=62e991395e57eab69cc4f93edad58785
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
index e9c4db93fcb3..1468d703a6ef 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=79afdd17bd4472fb276dea85c2465621
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
index cda220177ef6..f04047f63a05 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=79afdd17bd4472fb276dea85c2465621
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999 b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
index ed19849353c6..8fe67ab678d5 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_gui_py_common https://github.com/ros-visualization/qt_gui_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=79afdd17bd4472fb276dea85c2465621
diff --git a/metadata/md5-cache/dev-ros/random_numbers-0.3.2 b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
index b01f5753107a..dd818ada363d 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.2
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Wrappers for generating floating point values, integers and quaternions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/random_numbers https://github.com/ros-planning/random_numbers
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.2.tar.gz -> random_numbers-0.3.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7e2da958e332fed47263a047239460ef
diff --git a/metadata/md5-cache/dev-ros/random_numbers-9999 b/metadata/md5-cache/dev-ros/random_numbers-9999
index 159fce782054..7da53e532a65 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-9999
+++ b/metadata/md5-cache/dev-ros/random_numbers-9999
@@ -1,16 +1,16 @@
 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] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Wrappers for generating floating point values, integers and quaternions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/random_numbers https://github.com/ros-planning/random_numbers
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7e2da958e332fed47263a047239460ef
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.16.1 b/metadata/md5-cache/dev-ros/realtime_tools-1.16.1
index 62030b671781..6a757e415496 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.16.1
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.16.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools that can be used from a hard realtime thread
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/realtime_tools https://github.com/ros-controls/realtime_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.16.1.tar.gz -> realtime_tools-1.16.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=77cfb662dad3bbce1230df2fa74fe555
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-9999 b/metadata/md5-cache/dev-ros/realtime_tools-9999
index 33c58cf6191b..6d1c6cf39659 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-9999
+++ b/metadata/md5-cache/dev-ros/realtime_tools-9999
@@ -1,16 +1,16 @@
 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-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/gtest dev-ros/actionlib ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools that can be used from a hard realtime thread
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/realtime_tools https://github.com/ros-controls/realtime_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d7b5d09bf7ee715154cc61a9fc647af0
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-1.12.6 b/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
index 47596d2228b8..5cdaae284d2a 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Retrieves data from url-format files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/resource_retriever https://github.com/ros/resource_retriever
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.6.tar.gz -> resource_retriever-1.12.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=14140a9105b15d9897a8677952f01ae0
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-9999 b/metadata/md5-cache/dev-ros/resource_retriever-9999
index 54d915cdaae9..e2fd9398c8be 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-9999
+++ b/metadata/md5-cache/dev-ros/resource_retriever-9999
@@ -1,16 +1,16 @@
 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/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Retrieves data from url-format files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/resource_retriever https://github.com/ros/resource_retriever
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] net-misc/curl python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=14140a9105b15d9897a8677952f01ae0
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0 b/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
index 7bc27076d6f6..44d46cff850b 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rgbd_launch https://github.com/ros-drivers/rgbd_launch
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.3.0.tar.gz -> rgbd_launch-2.3.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a0172aa3b993be0c56d9d9cf0efa7a6
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-9999 b/metadata/md5-cache/dev-ros/rgbd_launch-9999
index 22017599bb7d..5c0a3f002548 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-9999
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-9999
@@ -1,16 +1,16 @@
 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/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rgbd_launch https://github.com/ros-drivers/rgbd_launch
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a0172aa3b993be0c56d9d9cf0efa7a6
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.7.0 b/metadata/md5-cache/dev-ros/robot_localization-2.7.0
index f404d95a4c0e..1edc12b80c4c 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-2.7.0
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.7.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/roslint dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.7.0.tar.gz -> robot_localization-2.7.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fd7bb1f975f0d0a4bc368f4f5aaa92b8
diff --git a/metadata/md5-cache/dev-ros/robot_localization-9999 b/metadata/md5-cache/dev-ros/robot_localization-9999
index 80db0f2c9881..9bf419897522 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-9999
+++ b/metadata/md5-cache/dev-ros/robot_localization-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/roslint >=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/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_filters dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp:= dev-ros/nodelet dev-libs/console_bridge:= sci-geosciences/GeographicLib:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fd7bb1f975f0d0a4bc368f4f5aaa92b8
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
index 0c2e993b73d5..8502e7599040 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Estimate the 3D pose of a robot from pose measurements from various sources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_ekf https://github.com/ros-planning/robot_pose_ekf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/robot_pose_ekf/archive/1.14.5.tar.gz -> robot_pose_ekf-1.14.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2e2a90cd5523569c0b24e79d52b64127
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999 b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
index 3f9096b3a8d4..42969659b3ec 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -1,16 +1,16 @@
 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-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) virtual/pkgconfig python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Estimate the 3D pose of a robot from pose measurements from various sources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_ekf https://github.com/ros-planning/robot_pose_ekf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2e2a90cd5523569c0b24e79d52b64127
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4 b/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
index e9f0da0af311..3740cf18369f 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A Simple Node to Publish the Robot's Position Relative to the Map using TFs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_publisher https://github.com/GT-RAIL/robot_pose_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GT-RAIL/robot_pose_publisher/archive/0.2.4.tar.gz -> robot_pose_publisher-0.2.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=26bb91a7f9c5021909e35f76f9a3a83d
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999 b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
index 75cea50adfbc..b92e36348da5 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
@@ -1,16 +1,16 @@
 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-ros/tf dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A Simple Node to Publish the Robot's Position Relative to the Map using TFs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_pose_publisher https://github.com/GT-RAIL/robot_pose_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=26bb91a7f9c5021909e35f76f9a3a83d
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1 b/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
index 9de900e5fcf5..16dcdc6f1f69 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_state_publisher https://github.com/ros/robot_state_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_state_publisher/archive/1.15.1.tar.gz -> robot_state_publisher-1.15.1.tar.gz http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=joint_states_indexed.bag -> robot_state_publisher-1.15.1-joint_states_indexed.bag
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7e46f12c3c9356810c5bfb3b6ddaa7b5
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-9999 b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
index 392b9a180c7f..9f319a283c74 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
@@ -1,17 +1,17 @@
 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/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_state_publisher https://github.com/ros/robot_state_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl:= dev-ros/roscpp dev-ros/rosconsole dev-ros/rostime dev-ros/tf2_ros dev-ros/tf2_kdl dev-ros/kdl_conversions dev-ros/sensor_msgs dev-ros/tf dev-ros/urdf dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=joint_states_indexed.bag -> robot_state_publisher-9999-joint_states_indexed.bag
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7e46f12c3c9356810c5bfb3b6ddaa7b5
diff --git a/metadata/md5-cache/dev-ros/ros_environment-1.3.2 b/metadata/md5-cache/dev-ros/ros_environment-1.3.2
index b5383d662b25..6d324d9a3a99 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-1.3.2
+++ b/metadata/md5-cache/dev-ros/ros_environment-1.3.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS environment variables
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_environment https://github.com/ros/ros_environment
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_environment/archive/1.3.2.tar.gz -> ros_environment-1.3.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/ros_environment-9999 b/metadata/md5-cache/dev-ros/ros_environment-9999
index 492999d6da8c..f1c5674ca42d 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-9999
+++ b/metadata/md5-cache/dev-ros/ros_environment-9999
@@ -1,16 +1,16 @@
 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/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS environment variables
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_environment https://github.com/ros/ros_environment
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.10 b/metadata/md5-cache/dev-ros/rosapi-0.11.10
index 4a96abbe6dbe..a4ccd0aa0b0a 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.13 b/metadata/md5-cache/dev-ros/rosapi-0.11.13
index 2a049ecddf1e..0c495f00c730 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.13
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.13.tar.gz -> rosbridge_suite-0.11.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47a4f32c84372667d363bf362edbcf05
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.9 b/metadata/md5-cache/dev-ros/rosapi-0.11.9
index 861877f0ecbc..43db8862af5e 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosapi-9999 b/metadata/md5-cache/dev-ros/rosapi-9999
index 72bf16635342..7eda6905f69e 100644
--- a/metadata/md5-cache/dev-ros/rosapi-9999
+++ b/metadata/md5-cache/dev-ros/rosapi-9999
@@ -1,16 +1,16 @@
 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/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosauth-1.0.1 b/metadata/md5-cache/dev-ros/rosauth-1.0.1
index be20e472a3fd..54cbaac5e400 100644
--- a/metadata/md5-cache/dev-ros/rosauth-1.0.1
+++ b/metadata/md5-cache/dev-ros/rosauth-1.0.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Server Side tools for Authorization and Authentication of ROS Clients
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosauth https://github.com/WPI-RAIL/rosauth
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WPI-RAIL/rosauth/archive/1.0.1.tar.gz -> rosauth-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=495c4ad18b4db7227d75f2a75f560125
diff --git a/metadata/md5-cache/dev-ros/rosauth-9999 b/metadata/md5-cache/dev-ros/rosauth-9999
index 68704de30fe1..5c6d874b16f3 100644
--- a/metadata/md5-cache/dev-ros/rosauth-9999
+++ b/metadata/md5-cache/dev-ros/rosauth-9999
@@ -1,16 +1,16 @@
 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/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Server Side tools for Authorization and Authentication of ROS Clients
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosauth https://github.com/WPI-RAIL/rosauth
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=495c4ad18b4db7227d75f2a75f560125
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.10 b/metadata/md5-cache/dev-ros/rosbag-1.15.10
index 312dab0c87cf..b33e0cc82156 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f69a57cb2804ceabb4b528d248d6b3df
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.7 b/metadata/md5-cache/dev-ros/rosbag-1.15.7
index 307fd4599442..90332bc8c980 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.8 b/metadata/md5-cache/dev-ros/rosbag-1.15.8
index cd651c47463d..15405eddb394 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.9 b/metadata/md5-cache/dev-ros/rosbag-1.15.9
index 7940198c7ebb..ed8af74af6ba 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-9999 b/metadata/md5-cache/dev-ros/rosbag-9999
index ba47e4f67105..c642a4ba4cc7 100644
--- a/metadata/md5-cache/dev-ros/rosbag-9999
+++ b/metadata/md5-cache/dev-ros/rosbag-9999
@@ -1,16 +1,16 @@
 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-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=lz4 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=lz4 python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/genpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/python-gnupg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-gnupg[python_targets_python3_9(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
index 458aefa54579..1ba1d64946fe 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Allows to export rosbag migration rule files without depending on rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_migration_rule https://github.com/ros/rosbag_migration_rule
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosbag_migration_rule/archive/1.0.1.tar.gz -> rosbag_migration_rule-1.0.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=016be3e9e4e5c5c8c0fd99b41c6d0b82
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
index 8966075df370..452449aab664 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Allows to export rosbag migration rule files without depending on rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_migration_rule https://github.com/ros/rosbag_migration_rule
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=016be3e9e4e5c5c8c0fd99b41c6d0b82
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.10 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.10
index 07c9864a8a73..6541960ab26c 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=be2b4df857505e0abeb2fb26d6867948
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
index a3b6fda456ac..2c5960f3e2df 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6c644faf2924fe157758925ee15e0f4f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.9 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.9
index b3e6dc77d655..b1c0c7b8907f 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6c644faf2924fe157758925ee15e0f4f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 10497605be2d..202c58c1542c 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,16 +1,16 @@
 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 dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 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
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6c644faf2924fe157758925ee15e0f4f
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.5 b/metadata/md5-cache/dev-ros/rosbash-1.15.5
index 0007fb347d81..48a20572cee9 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.6 b/metadata/md5-cache/dev-ros/rosbash-1.15.6
index fb38fe225972..a0d25ca4d3f8 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.7 b/metadata/md5-cache/dev-ros/rosbash-1.15.7
index d9aa3ce16bbc..bcc445015282 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-9999 b/metadata/md5-cache/dev-ros/rosbash-9999
index c8fabfffc29f..b68ff425bc89 100644
--- a/metadata/md5-cache/dev-ros/rosbash-9999
+++ b/metadata/md5-cache/dev-ros/rosbash-9999
@@ -1,16 +1,16 @@
 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/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospack python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
index 0f96277c39f6..396d6319edd0 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
index 06d49d094051..0697e2bcc344 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.7 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.7
index 16863f745296..bca94f9afb2f 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-9999 b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
index b473e5c12309..636cee987d25 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-9999
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosboost_cfg https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10 b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
index 81ad62b0afa3..021941084013 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.13 b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.13
index d6ef292c09eb..cae819b7718f 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.13
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.13.tar.gz -> rosbridge_suite-0.11.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3c6fb45d8f4300bcf0628042bdbc80a2
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9 b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
index f636fb4bfc20..66eb08e64d77 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-9999 b/metadata/md5-cache/dev-ros/rosbridge_library-9999
index 8be5ac2054da..20a9c2ac6887 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Core rosbridge package for parsing JSON and performing the appropriate action
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_library https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pymongo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pymongo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10 b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
index 0dbe79c140f1..b720020847fa 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.13 b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.13
index bc7e002c7cc8..96330e4db6c7 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.13
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.13
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.13.tar.gz -> rosbridge_suite-0.11.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c40d3ad9f6e285ee1fdd5bd015176012
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9 b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
index a278c3108720..67118e7630d3 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999 b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
index caca295c1c19..f89bb2d71475 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10 b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
index 0da666023876..4b2625549f87 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.13 b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.13
index a47af971863e..471da4f77c8c 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.13
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.13.tar.gz -> rosbridge_suite-0.11.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1f0259f86b9d94b683186fd029e467cd
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9 b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
index 3a1988da965c..18622a32e083 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-9999 b/metadata/md5-cache/dev-ros/rosbridge_server-9999
index 9f0dab7935fb..a06b54c0ddef 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-9999
@@ -1,16 +1,16 @@
 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/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosapi[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosauth[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( www-servers/tornado[python_targets_python3_8(-)] ) python_single_target_python3_9? ( www-servers/tornado[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/autobahn[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/twisted[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/twisted[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.5 b/metadata/md5-cache/dev-ros/rosbuild-1.15.5
index 454b318d67bd..d57a09b78f47 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.6 b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
index 5268c76a1f42..91d577971e67 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.7 b/metadata/md5-cache/dev-ros/rosbuild-1.15.7
index 3a627f34ec17..206f4d750755 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-9999 b/metadata/md5-cache/dev-ros/rosbuild-9999
index 96f8cb10aab8..b087c3111b23 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-9999
+++ b/metadata/md5-cache/dev-ros/rosbuild-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.5 b/metadata/md5-cache/dev-ros/rosclean-1.15.5
index 62030a155896..6e51d1c145ce 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.6 b/metadata/md5-cache/dev-ros/rosclean-1.15.6
index 25ca141fd4a3..8689fd8b0ffa 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.7 b/metadata/md5-cache/dev-ros/rosclean-1.15.7
index af4ed14f595a..ec3d5cef7148 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-9999 b/metadata/md5-cache/dev-ros/rosclean-9999
index 32f6ea523804..27ad4b7d25a9 100644
--- a/metadata/md5-cache/dev-ros/rosclean-9999
+++ b/metadata/md5-cache/dev-ros/rosclean-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.14.0 b/metadata/md5-cache/dev-ros/rosconsole-1.14.0
index 7b5c824981e1..d99a5e235477 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
 INHERIT=ros-catkin
-IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=+log4cxx glog python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole/archive/1.14.0.tar.gz -> rosconsole-1.14.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.14.2 b/metadata/md5-cache/dev-ros/rosconsole-1.14.2
index 5c84a8438869..4663aa6a631d 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
 INHERIT=ros-catkin
-IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=+log4cxx glog python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole/archive/1.14.2.tar.gz -> rosconsole-1.14.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.14.3 b/metadata/md5-cache/dev-ros/rosconsole-1.14.3
index 33d5da5fcedc..f520d5bad7e5 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.3
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
 INHERIT=ros-catkin
-IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=+log4cxx glog python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole/archive/1.14.3.tar.gz -> rosconsole-1.14.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole-9999 b/metadata/md5-cache/dev-ros/rosconsole-9999
index b0b6ce9ea509..22f689e7aaee 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
 INHERIT=ros-catkin
-IUSE=+log4cxx glog python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=+log4cxx glog python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4 b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
index e8b08ff1c472..dc76012d97b3 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole_bridge https://github.com/ros/rosconsole_bridge
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole_bridge/archive/0.5.4.tar.gz -> rosconsole_bridge-0.5.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ef83949d69304343a9efba003de0a8fb
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999 b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
index bd095a351b03..a6614050ff39 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
@@ -1,16 +1,16 @@
 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:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole_bridge https://github.com/ros/rosconsole_bridge
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ef83949d69304343a9efba003de0a8fb
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.10 b/metadata/md5-cache/dev-ros/roscpp-1.15.10
index 8042a0c0ea3a..dd17434edeb7 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.10
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ca4f21893334635ec7222c8610909db0
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.9 b/metadata/md5-cache/dev-ros/roscpp-1.15.9
index 34e67a60607e..13580161db30 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.9
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dbbc2524686bf77a7698507daa5c8bf6
diff --git a/metadata/md5-cache/dev-ros/roscpp-9999 b/metadata/md5-cache/dev-ros/roscpp-9999
index 7f884a32cd9b..adeca9023d07 100644
--- a/metadata/md5-cache/dev-ros/roscpp-9999
+++ b/metadata/md5-cache/dev-ros/roscpp-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=dbbc2524686bf77a7698507daa5c8bf6
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
index b40c37628b1a..dd5b119b8477 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Code for serialization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_serialization https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7c44874a13858d172a270c905d8f7d8d
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-9999 b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
index facfa6bec78a..10ea506a47a0 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Code for serialization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_serialization https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7c44874a13858d172a270c905d8f7d8d
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2 b/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
index 611a9b1bf8f2..0d922d7c0ac8 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Message traits code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_traits https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e39f2c98a32da1734dc1721a4959cefa
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-9999 b/metadata/md5-cache/dev-ros/roscpp_traits-9999
index 80cfab7ace3b..97a2a8b11932 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Message traits code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_traits https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e39f2c98a32da1734dc1721a4959cefa
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
index c506aa78ecff..10e095d6e136 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
index 0173fdb6b346..62bb7160615f 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999 b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
index 0bf75ced04d6..cd30eab784be 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
@@ -1,16 +1,16 @@
 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/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_tutorials https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.15.6 b/metadata/md5-cache/dev-ros/roscreate-1.15.6
index 314a8f888eaa..665de6bc0159 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.15.6
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d09d1337c8d641229de9f4c31e808a36
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.15.7 b/metadata/md5-cache/dev-ros/roscreate-1.15.7
index 07cdc336de0d..f5a89e7c26d6 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.15.7
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d09d1337c8d641229de9f4c31e808a36
diff --git a/metadata/md5-cache/dev-ros/roscreate-9999 b/metadata/md5-cache/dev-ros/roscreate-9999
index 7f0ea8f8244d..85784fb1d6cc 100644
--- a/metadata/md5-cache/dev-ros/roscreate-9999
+++ b/metadata/md5-cache/dev-ros/roscreate-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d09d1337c8d641229de9f4c31e808a36
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
index 6f3211772502..58266127fab8 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.2 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.2
index 6232053ca57e..0cab33554c21 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.2
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.3 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.3
index f5b4cf286eaf..07b5c7fc56ee 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.3
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=08509753864ba34649d83179bf7178a8
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.4 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.4
index b44210fb92eb..12b2c2340710 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.4
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=08509753864ba34649d83179bf7178a8
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
index dbad07499fae..22b08b75d474 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
index 111b3918d1fe..25d639312dc4 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-9999 b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
index ae02d8850e2a..d3a9319891dd 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-9999
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
@@ -1,16 +1,16 @@
 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/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.10 b/metadata/md5-cache/dev-ros/rosgraph-1.15.10
index 67acc59c7992..5da71756a7d7 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c94e55405c83a8d6ff4749f59a7f8b47
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.8 b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
index 37c117dab0d0..79f30f4226c8 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=410c28c128f6deed079ad289ea290b0e
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.9 b/metadata/md5-cache/dev-ros/rosgraph-1.15.9
index 2bf753fe4617..35bc7efd7475 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=410c28c128f6deed079ad289ea290b0e
diff --git a/metadata/md5-cache/dev-ros/rosgraph-9999 b/metadata/md5-cache/dev-ros/rosgraph-9999
index 00fc678b07cc..eb3a5a5aa857 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-9999
@@ -1,16 +1,16 @@
 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-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/netifaces[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/netifaces[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=410c28c128f6deed079ad289ea290b0e
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3 b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
index 0e43e271f20b..bc6ac634a00f 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph_msgs https://github.com/ros/ros_comm_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.3.tar.gz -> ros_comm_msgs-1.11.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4cf45a13da9a6d2d3d580a6bdc6a1b17
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999 b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
index 144cb1bb2f92..9ae0850240b8 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph_msgs https://github.com/ros/ros_comm_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4cf45a13da9a6d2d3d580a6bdc6a1b17
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.5 b/metadata/md5-cache/dev-ros/roslang-1.15.5
index baff14124366..9fd9dcc02642 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.6 b/metadata/md5-cache/dev-ros/roslang-1.15.6
index f5293c40b87a..f7246cf5958c 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.6
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.7 b/metadata/md5-cache/dev-ros/roslang-1.15.7
index 81f649c71ad9..92189591d442 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.7
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-9999 b/metadata/md5-cache/dev-ros/roslang-9999
index 8809b0a1051f..bab9964961ba 100644
--- a/metadata/md5-cache/dev-ros/roslang-9999
+++ b/metadata/md5-cache/dev-ros/roslang-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.10 b/metadata/md5-cache/dev-ros/roslaunch-1.15.10
index 0bf9067b4cab..4762a835b1d3 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.10
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin user
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
 _md5_=927801d7338283e027fcfc55e2d7c382
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1 b/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
index 8fa513499eb8..2c437e9d3ac8 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin user
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
 _md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.9 b/metadata/md5-cache/dev-ros/roslaunch-1.15.9
index 6c6cf9770157..c04190fbbd8c 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.9
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin user
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
 _md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index fff1c2bc6866..0a802a6af446 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout test? ( python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin user
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosclean[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosout python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	user	26d8ce6329c43cbac965617f1c0627e2
 _md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslib-1.15.6 b/metadata/md5-cache/dev-ros/roslib-1.15.6
index 1c5316d24cd7..573b6081eb69 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.15.6
+++ b/metadata/md5-cache/dev-ros/roslib-1.15.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35e443478414512991ac0775738f95c7
diff --git a/metadata/md5-cache/dev-ros/roslib-1.15.7 b/metadata/md5-cache/dev-ros/roslib-1.15.7
index 2a9b93d9f4d4..68fb3c05c6a6 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.15.7
+++ b/metadata/md5-cache/dev-ros/roslib-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35e443478414512991ac0775738f95c7
diff --git a/metadata/md5-cache/dev-ros/roslib-9999 b/metadata/md5-cache/dev-ros/roslib-9999
index a6d4f2a86cac..6faaa2f28b7d 100644
--- a/metadata/md5-cache/dev-ros/roslib-9999
+++ b/metadata/md5-cache/dev-ros/roslib-9999
@@ -1,16 +1,16 @@
 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-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >=dev-python/rospkg-1.0.37[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/rospkg-1.0.37[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35e443478414512991ac0775738f95c7
diff --git a/metadata/md5-cache/dev-ros/roslint-0.12.0 b/metadata/md5-cache/dev-ros/roslint-0.12.0
index 18b6b1e41d86..1466d2e5e47d 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.12.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.12.0
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/make 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Static checking of Python or C++ source code for errors and standards compliance
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslint https://github.com/ros/roslint
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roslint/archive/0.12.0.tar.gz -> roslint-0.12.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=aeaaade39d278de7b6567f1e61fad1f8
diff --git a/metadata/md5-cache/dev-ros/roslint-9999 b/metadata/md5-cache/dev-ros/roslint-9999
index 2ad012ad1a99..effdbd434bdc 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Static checking of Python or C++ source code for errors and standards compliance
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslint https://github.com/ros/roslint
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=aeaaade39d278de7b6567f1e61fad1f8
diff --git a/metadata/md5-cache/dev-ros/roslisp-1.9.24 b/metadata/md5-cache/dev-ros/roslisp-1.9.24
index 31bdd71b61e9..628c4b291d05 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.24
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.24
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Lisp client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslisp https://github.com/ros/roslisp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roslisp/archive/1.9.24.tar.gz -> roslisp-1.9.24.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=50820048bc92b86e42b6f2f85d7863da
diff --git a/metadata/md5-cache/dev-ros/roslisp-9999 b/metadata/md5-cache/dev-ros/roslisp-9999
index f11236a1f7d6..786cc7bcbeb8 100644
--- a/metadata/md5-cache/dev-ros/roslisp-9999
+++ b/metadata/md5-cache/dev-ros/roslisp-9999
@@ -1,16 +1,16 @@
 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/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Lisp client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslisp https://github.com/ros/roslisp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=50820048bc92b86e42b6f2f85d7863da
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.10 b/metadata/md5-cache/dev-ros/roslz4-1.15.10
index 6fab0fe1cff5..f987baa95a29 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.10
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 dev-ros/cpp_common 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=app-arch/lz4 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3e0b581d158722e9949e18f83d0d50a0
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.8 b/metadata/md5-cache/dev-ros/roslz4-1.15.8
index e1d1c02d05a4..2b1f0873a726 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.8
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 dev-ros/cpp_common 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=app-arch/lz4 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ff32d78ac64e19b554bdc70cbcf7806
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.9 b/metadata/md5-cache/dev-ros/roslz4-1.15.9
index 6b6d32dd7741..7b1848a452a6 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.9
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 dev-ros/cpp_common 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=app-arch/lz4 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ff32d78ac64e19b554bdc70cbcf7806
diff --git a/metadata/md5-cache/dev-ros/roslz4-9999 b/metadata/md5-cache/dev-ros/roslz4-9999
index b2faba573b27..3bc8b1f4b8fe 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-9999
@@ -1,16 +1,16 @@
 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=app-arch/lz4 dev-ros/cpp_common 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=app-arch/lz4 dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/lz4 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ff32d78ac64e19b554bdc70cbcf7806
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.5 b/metadata/md5-cache/dev-ros/rosmake-1.15.5
index e086bda058ac..70df3178d48f 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.6 b/metadata/md5-cache/dev-ros/rosmake-1.15.6
index 15b070e01041..4cd4a26433c2 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.7 b/metadata/md5-cache/dev-ros/rosmake-1.15.7
index cf353f335dac..bf7870aac85e 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-9999 b/metadata/md5-cache/dev-ros/rosmake-9999
index 74821fd881f3..efff282c3ad2 100644
--- a/metadata/md5-cache/dev-ros/rosmake-9999
+++ b/metadata/md5-cache/dev-ros/rosmake-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.10 b/metadata/md5-cache/dev-ros/rosmaster-1.15.10
index ed4aec13718b..f91fb4d72909 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e205dc75b0a56073fed3c1288c618e4
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.7 b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
index 5b057d6f03ab..9756611834cc 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.8 b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
index 68060aaddf4b..4bc8bcbaa6d7 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.9 b/metadata/md5-cache/dev-ros/rosmaster-1.15.9
index 9549899fd4c4..d658e38752b8 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-9999 b/metadata/md5-cache/dev-ros/rosmaster-9999
index 380f0e6c92df..bcf139819773 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-9999
@@ -1,16 +1,16 @@
 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/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.10 b/metadata/md5-cache/dev-ros/rosmsg-1.15.10
index 85f20a2f7036..86179448e757 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0ea1d7c50077f11431ab63ee1f424714
diff --git a/metadata/md5-cache/dev-ros/rosmsg-9999 b/metadata/md5-cache/dev-ros/rosmsg-9999
index 2f46facc6ca9..cf6f35f0fad6 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0ea1d7c50077f11431ab63ee1f424714
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.10 b/metadata/md5-cache/dev-ros/rosnode-1.15.10
index da8b6204f4be..051dae7702ad 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2a4b4d748e32d49ffd046c74de9d70fc
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.8 b/metadata/md5-cache/dev-ros/rosnode-1.15.8
index d35fb8aeef52..7f0979b6d918 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.9 b/metadata/md5-cache/dev-ros/rosnode-1.15.9
index 337ef296819e..bd99a70fafd9 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index 09989d00f8ce..6cad91e87622 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -1,16 +1,16 @@
 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/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.10 b/metadata/md5-cache/dev-ros/rosout-1.15.10
index 9ad54d605322..d50426b7c1c8 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9ea485ff62f635b8500ccb41ea5b8d8c
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.7 b/metadata/md5-cache/dev-ros/rosout-1.15.7
index 75b20fa547e5..2b45074e5fee 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.8 b/metadata/md5-cache/dev-ros/rosout-1.15.8
index b58fabe91ba6..7e2c9b3408ad 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.9 b/metadata/md5-cache/dev-ros/rosout-1.15.9
index b76296f49b43..7f65b5c4c6e8 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-9999 b/metadata/md5-cache/dev-ros/rosout-9999
index 0cb7027f84ea..4e435af5ff69 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-9999
@@ -1,16 +1,16 @@
 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-ros/rosgraph_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rospack-2.6.2 b/metadata/md5-cache/dev-ros/rospack-2.6.2
index ffae31186363..22c8eb5cee71 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.6.2
+++ b/metadata/md5-cache/dev-ros/rospack-2.6.2
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-ros/cmake_modules-0.4.1 dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospack https://github.com/ros/rospack
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rospack/archive/2.6.2.tar.gz -> rospack-2.6.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3004cce08dc048d47c82bc9fdd0f4191
diff --git a/metadata/md5-cache/dev-ros/rospack-9999 b/metadata/md5-cache/dev-ros/rospack-9999
index 8d06774d3548..54b1df093faf 100644
--- a/metadata/md5-cache/dev-ros/rospack-9999
+++ b/metadata/md5-cache/dev-ros/rospack-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-ros/cmake_modules-0.4.1 >=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:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospack https://github.com/ros/rospack
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3004cce08dc048d47c82bc9fdd0f4191
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.10 b/metadata/md5-cache/dev-ros/rosparam-1.15.10
index 7cfd1d4bfd92..2ed01fd4a5f1 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e2621e724f434235874d8ae18426e3b8
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.7 b/metadata/md5-cache/dev-ros/rosparam-1.15.7
index e2c545d1af9e..4620993fe62f 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.8 b/metadata/md5-cache/dev-ros/rosparam-1.15.8
index 2758d7f57e1c..60d3f4931a3d 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.9 b/metadata/md5-cache/dev-ros/rosparam-1.15.9
index e7867202b236..b14908634d8c 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-9999 b/metadata/md5-cache/dev-ros/rosparam-9999
index 67e0a7bc55d3..7408d7535555 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-9999
@@ -1,16 +1,16 @@
 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/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.10 b/metadata/md5-cache/dev-ros/rospy-1.15.10
index 33454e5f2f04..0b4e481a88fc 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.10
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8fe0773b54ce794b8630d1adf97bf984
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.7 b/metadata/md5-cache/dev-ros/rospy-1.15.7
index 2adeabeffacc..9c2f25b17717 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.7
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.8 b/metadata/md5-cache/dev-ros/rospy-1.15.8
index 3eae9abf0890..f3565ff98020 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.8
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.9 b/metadata/md5-cache/dev-ros/rospy-1.15.9
index d9ae9d83f423..48fb8bfa0743 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.9
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-9999 b/metadata/md5-cache/dev-ros/rospy-9999
index 3cd52673cb5d..83b38865d2a1 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-9999
@@ -1,16 +1,16 @@
 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/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roscpp[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
index d216fda9a371..ff7a8378e87f 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
index b96fa7852b14..92429725d32f 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-9999 b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
index d3c68a0c2e04..f3873af886b6 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp_tutorials ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy_tutorials https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
index 63598d314725..6d77a0742363 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1
index d6d7bb9b7c28..aed82c82df3e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-9999 b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
index bcb3c436ab85..a6b3e85c8f0e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
index 5b54e6a9ed10..acd9707ff6b9 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_client-0.9.1
index ea0f5e7c7025..61e91944deb3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-9999 b/metadata/md5-cache/dev-ros/rosserial_client-9999
index 7692300818e4..7b0508736dfd 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_client-9999
@@ -1,16 +1,16 @@
 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/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
index 0edfb91d6d66..221040868fad 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1
index ec731d065cd9..26d7997d3957 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
index 8c6d59f78350..ca773ccbf96c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
@@ -1,16 +1,16 @@
 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/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
index 3acc74bf60da..4639ca3b6c32 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1
index c7332b71a62d..0f235f241dac 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-9999 b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
index 8ea3b2f4cd2c..0edd11bb03ee 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
index 38f6840440d0..e478c322907d 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_python-0.9.1
index 40c636b97b16..e11a3eb297fb 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-9999 b/metadata/md5-cache/dev-ros/rosserial_python-9999
index 0be12952a4a5..76bbe9167c57 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_server-0.9.1
index 9cfe53628646..41373b11c6c7 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/topic_tools 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1d8de4944216922cf488a1c60825f3fe
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-9999 b/metadata/md5-cache/dev-ros/rosserial_server-9999
index 1d33172c088f..1ebf41e73842 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -1,16 +1,16 @@
 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-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/topic_tools 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1d8de4944216922cf488a1c60825f3fe
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
index 9f87debe5a6c..3b499f923711 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1
index e1944c4fa04b..d8cf253b7b62 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-9999 b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
index e7e237efe906..6741008dbd92 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
@@ -1,16 +1,16 @@
 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/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
index 475ad0c99bd1..ee4dd786bf34 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1
index 09e77ab8470d..322f2e93b4f4 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-9999 b/metadata/md5-cache/dev-ros/rosserial_windows-9999
index 199b423a1960..a21f27c20dcd 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-9999
@@ -1,16 +1,16 @@
 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/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_client[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
index e1717b5df81b..6481230ef89f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1
index c23ff2bccd8b..2b745af4eb9b 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-9999 b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
index c2c13106ee46..413ba631a909 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosserial_python[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.10 b/metadata/md5-cache/dev-ros/rosservice-1.15.10
index bc769c480614..8d016ee8b99a 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.10
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e317eb81ea9b47fa74e480cbec5bece
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.7 b/metadata/md5-cache/dev-ros/rosservice-1.15.7
index cf01957e4926..b2094bfcb454 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.8 b/metadata/md5-cache/dev-ros/rosservice-1.15.8
index 82a7745b82aa..fc9c76721961 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.9 b/metadata/md5-cache/dev-ros/rosservice-1.15.9
index 621ff1a8c4c6..a572596b99d2 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.9
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-9999 b/metadata/md5-cache/dev-ros/rosservice-9999
index 716a13752bb5..87f50660e190 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-9999
@@ -1,16 +1,16 @@
 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/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.10 b/metadata/md5-cache/dev-ros/rostest-1.15.10
index 20f94b761ef6..0f1a090da243 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.15.10
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7421e7df8e24d7b87f5e3ce49611e68b
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.8 b/metadata/md5-cache/dev-ros/rostest-1.15.8
index faa6577d41b3..205bb11eb221 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.15.8
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=12e9c999d29d688ca01bd25b33e9d871
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.9 b/metadata/md5-cache/dev-ros/rostest-1.15.9
index 97ca70b21331..c299c66d824f 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.15.9
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=12e9c999d29d688ca01bd25b33e9d871
diff --git a/metadata/md5-cache/dev-ros/rostest-9999 b/metadata/md5-cache/dev-ros/rostest-9999
index 48f803395067..65fc4a1cee5f 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-9999
@@ -1,16 +1,16 @@
 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/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice dev-cpp/gtest dev-ros/rostopic ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=12e9c999d29d688ca01bd25b33e9d871
diff --git a/metadata/md5-cache/dev-ros/rostime-0.7.2 b/metadata/md5-cache/dev-ros/rostime-0.7.2
index 028b45201efd..53e34aeca77c 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.7.2
+++ b/metadata/md5-cache/dev-ros/rostime-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostime https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb75d86a8d373f1c0239715407a047fa
diff --git a/metadata/md5-cache/dev-ros/rostime-9999 b/metadata/md5-cache/dev-ros/rostime-9999
index b607369b6cef..2654bf0e97a2 100644
--- a/metadata/md5-cache/dev-ros/rostime-9999
+++ b/metadata/md5-cache/dev-ros/rostime-9999
@@ -1,16 +1,16 @@
 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/cpp_common 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostime https://github.com/ros/roscpp_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fb75d86a8d373f1c0239715407a047fa
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.10 b/metadata/md5-cache/dev-ros/rostopic-1.15.10
index f101283c55ee..21835eb57bda 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.10
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a0684bbc1ebda4bb46c6642dd3f0595c
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.8 b/metadata/md5-cache/dev-ros/rostopic-1.15.8
index e612d13ab22b..9b6b71bc7ae2 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.8
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8138353993a17636f40fa1af6057dba2
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.9 b/metadata/md5-cache/dev-ros/rostopic-1.15.9
index 3064607a407a..5ab95a313c56 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.9
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8138353993a17636f40fa1af6057dba2
diff --git a/metadata/md5-cache/dev-ros/rostopic-9999 b/metadata/md5-cache/dev-ros/rostopic-9999
index 036c8a1c537b..64853538a540 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-9999
@@ -1,16 +1,16 @@
 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[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8138353993a17636f40fa1af6057dba2
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.5 b/metadata/md5-cache/dev-ros/rosunit-1.15.5
index 5ee7b3bffde5..426e450f6125 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.6 b/metadata/md5-cache/dev-ros/rosunit-1.15.6
index 3197328c5035..9db1a26e0a78 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.7 b/metadata/md5-cache/dev-ros/rosunit-1.15.7
index f5c3b41febc2..9f1568967bc3 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.7.tar.gz -> ros-1.15.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-9999 b/metadata/md5-cache/dev-ros/rosunit-9999
index fc4676b9f0eb..12840ecd7c5e 100644
--- a/metadata/md5-cache/dev-ros/rosunit-9999
+++ b/metadata/md5-cache/dev-ros/rosunit-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.10 b/metadata/md5-cache/dev-ros/roswtf-1.15.10
index bd7bb104f463..2d1ad9458e8c 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.10
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=test? ( dev-ros/cmake_modules ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9dd1da9e592b4bca303e7d1b46c0d636
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.8 b/metadata/md5-cache/dev-ros/roswtf-1.15.8
index 6d897220a132..beb78f7c275d 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.8
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=test? ( dev-ros/cmake_modules ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=17f255589bd3ddf8e325af975822863f
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.9 b/metadata/md5-cache/dev-ros/roswtf-1.15.9
index ef3e1f5d99e7..69a67369e919 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.9
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=test? ( dev-ros/cmake_modules ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=17f255589bd3ddf8e325af975822863f
diff --git a/metadata/md5-cache/dev-ros/roswtf-9999 b/metadata/md5-cache/dev-ros/roswtf-9999
index e247b7b639c4..0e26302429c6 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-9999
@@ -1,16 +1,16 @@
 BDEPEND=test? ( dev-ros/cmake_modules ) >=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-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslang[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-util/rosdep[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/rosdep[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/paramiko[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbuild[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=17f255589bd3ddf8e325af975822863f
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0 b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
index d20957cfc356..95a66b59341b 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.1 b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.1
index 6bb15b14e1cb..42bb0fbc8209 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.1
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index ae80e8e3f221..36e808af71e9 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -1,16 +1,16 @@
 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/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.9 b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
index d1bcec17900d..962b8b6ae4f1 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_action https://github.com/ros-visualization/rqt_action
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_action/archive/0.4.9.tar.gz -> rqt_action-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=03ac5926db66a3c233cb044ccad4946c
diff --git a/metadata/md5-cache/dev-ros/rqt_action-9999 b/metadata/md5-cache/dev-ros/rqt_action-9999
index 31ae3300911a..f193f9c02e4b 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_action https://github.com/ros-visualization/rqt_action
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=03ac5926db66a3c233cb044ccad4946c
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.15 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
index cacf1393048e..884a6e9f8991 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.15.tar.gz -> rqt_bag-0.4.15.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-9999 b/metadata/md5-cache/dev-ros/rqt_bag-9999
index 928431164d04..c97ea12879bb 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
index 816a56b9cb31..ae378c4da15f 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.15.tar.gz -> rqt_bag-0.4.15.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=efde050257d357297145beb708d3f729
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
index 5d6cc8de9dce..95d578e29732 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag_plugins https://github.com/ros-visualization/rqt_bag
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=efde050257d357297145beb708d3f729
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.11 b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
index 7949d5b11609..dddbc5a1e478 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_console
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_console/archive/0.4.11.tar.gz -> rqt_console-0.4.11.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=364b5d1158f5632babd0cebe1663f1e8
diff --git a/metadata/md5-cache/dev-ros/rqt_console-9999 b/metadata/md5-cache/dev-ros/rqt_console-9999
index 9d98a916bc4b..069c2dc28334 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_console https://github.com/ros-visualization/rqt_console
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_logger_level[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=364b5d1158f5632babd0cebe1663f1e8
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
index 7a342f32787f..4e447eb8e849 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
index 68ff85f2c801..44beafb3d5e3 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.3 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.3
index 5ba8c49b783c..7b6c7e12fc42 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.3
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.3
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.4 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.4
index 95b087e9743c..824ee429f6d6 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.4
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.4
@@ -1,17 +1,17 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=da2cba38924b9dfe17775ffd18d29676
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999 b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
index f2777f2f0275..bc0c2a8e5047 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
@@ -1,16 +1,16 @@
 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
index 53780fc37cf5..5f6662371e94 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.10.tar.gz -> rqt_dep-0.4.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9331376cee8d83fc91ff6c88239e701f
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-9999 b/metadata/md5-cache/dev-ros/rqt_dep-9999
index 319e6aaf9533..3716d4280b6a 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9331376cee8d83fc91ff6c88239e701f
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.14 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
index e9396847dd6d..d37931a4d365 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.14.tar.gz -> rqt_graph-0.4.14.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=08e33af7fbb2839e08c857e92f5488a3
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-9999 b/metadata/md5-cache/dev-ros/rqt_graph-9999
index 3d11582d7ecb..c2e98747b928 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_graph https://github.com/ros-visualization/rqt_graph
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=08e33af7fbb2839e08c857e92f5488a3
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
index 3acce46e8cee..7f2bef9fa7f2 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4154236a271b8032e520ed3ae15f20d6
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-9999 b/metadata/md5-cache/dev-ros/rqt_gui-9999
index b6e705ae4b6d..45424f4e5351 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -1,16 +1,16 @@
 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/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4154236a271b8032e520ed3ae15f20d6
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
index 594f183ad98f..2108caf44ff2 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
index db76160e59a2..ed9ea360df5d 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -1,16 +1,16 @@
 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-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
index 7d65831e38de..532215160b84 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=07bb753f9d503907082eda3a1e95b5a9
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-9999 b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
index ae921c38cfec..62d0a441ee93 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=07bb753f9d503907082eda3a1e95b5a9
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.16 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.16
index ad848d5e1e38..f441a53f6e2e 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.16
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.16
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_image_view https://github.com/ros-visualization/rqt_image_view
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.16.tar.gz -> rqt_image_view-0.4.16.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6e1210d84a04b5573c35a9a8220aef47
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-9999 b/metadata/md5-cache/dev-ros/rqt_image_view-9999
index ed95124ac50e..f6f435b027b0 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-9999
@@ -1,16 +1,16 @@
 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[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_image_view https://github.com/ros-visualization/rqt_image_view
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6e1210d84a04b5573c35a9a8220aef47
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.9 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.9
index 6a54a26b3f84..15eddcfa48f7 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Easy view of .launch files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.9.tar.gz -> rqt_launch-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=efc22c56f04960580f0bce126eeb3b60
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-9999 b/metadata/md5-cache/dev-ros/rqt_launch-9999
index 5572b17b336d..ec2a9876313f 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -1,16 +1,16 @@
 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/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Easy view of .launch files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=efc22c56f04960580f0bce126eeb3b60
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
index d4548260cea2..630eaa47688b 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_logger_level
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_logger_level/archive/0.4.11.tar.gz -> rqt_logger_level-0.4.11.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=39b6ff45cf6cf3d0ce48c17c063108fc
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-9999 b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
index 423cb5f6348a..4f60bd00fc91 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_logger_level https://github.com/ros-visualization/rqt_logger_level
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=39b6ff45cf6cf3d0ce48c17c063108fc
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
index 1844acc6dcfd..62d1d5448f43 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_moveit/archive/0.5.9.tar.gz -> rqt_moveit-0.5.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=95ef5531ef01ba95369c25cee54e12cb
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-9999 b/metadata/md5-cache/dev-ros/rqt_moveit-9999
index 72cfc11b1abe..369d6c06cfc9 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -1,16 +1,16 @@
 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/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosnode[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_topic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=95ef5531ef01ba95369c25cee54e12cb
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
index f2ce60994617..c28754de14c0 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.9.tar.gz -> rqt_msg-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=696f9747a699226d1aa78179a2493721
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-9999 b/metadata/md5-cache/dev-ros/rqt_msg-9999
index d11b1c22b18d..d4a31a121fda 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_msg https://github.com/ros-visualization/rqt_msg
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=696f9747a699226d1aa78179a2493721
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
index 86b670257927..10fc0408d944 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_nav_view
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_nav_view/archive/0.5.7.tar.gz -> rqt_nav_view-0.5.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f45f1ccc29b7a1cf785e711fb5562d81
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-9999 b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
index adba3fdda84f..1fec2715affb 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_nav_view https://github.com/ros-visualization/rqt_nav_view
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f45f1ccc29b7a1cf785e711fb5562d81
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.13 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.13
index 0e14b90e8d27..92c1dee46f5c 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_plot https://github.com/ros-visualization/rqt_plot
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_plot/archive/0.4.13.tar.gz -> rqt_plot-0.4.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=554eb2a14d47361ae5e6c3809bb0152b
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-9999 b/metadata/md5-cache/dev-ros/rqt_plot-9999
index 5988f0ef5420..c63d68673cb7 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -1,16 +1,16 @@
 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-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_plot https://github.com/ros-visualization/rqt_plot
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/matplotlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/matplotlib[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/pyqtgraph[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyqtgraph[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=76f32f03eefdff59fbbf4f1145c35ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
index 8b44a414778d..b73c9675f91c 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.10.tar.gz -> rqt_pose_view-0.5.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=53b5a70d3a6dbb057b02fedb3b7d40a0
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-9999 b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
index c78d1a8c57a0..a84c2c60fa8d 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_pose_view https://github.com/ros-visualization/rqt_pose_view
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyopengl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyopengl[python_targets_python3_9(-)] ) dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=53b5a70d3a6dbb057b02fedb3b7d40a0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
index a7cffdee3100..662da651a19a 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.9.tar.gz -> rqt_publisher-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ca4ae103b03a0a221e70e7c921c27e0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-9999 b/metadata/md5-cache/dev-ros/rqt_publisher-9999
index 9fc08f871c7e..ba7b3a403516 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_publisher https://github.com/ros-visualization/rqt_publisher
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ca4ae103b03a0a221e70e7c921c27e0
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2 b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
index 7ccf498aeea6..ef8b6c0383c1 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a4247c65291c3ab33f41629c2bc5fba
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-9999 b/metadata/md5-cache/dev-ros/rqt_py_common-9999
index 85f68a2f8cdd..6d5dba88a28f 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_common https://github.com/ros-visualization/rqt
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9a4247c65291c3ab33f41629c2bc5fba
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
index 00dbff32998d..2f09bb818d17 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.9.tar.gz -> rqt_py_console-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=753094002b8406055cdb156e0f51cecf
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-9999 b/metadata/md5-cache/dev-ros/rqt_py_console-9999
index c4b5cc4566bc..c19abe9c89a9 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_py_console https://github.com/ros-visualization/rqt_py_console
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=753094002b8406055cdb156e0f51cecf
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.4 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.4
index f475767d918e..365a6a241239 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.4
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.5.4.tar.gz -> rqt_reconfigure-0.5.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=120f9b2b276aa53a4a8ea16c6f48031d
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999 b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
index e9a3344b2458..3283c188e999 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=120f9b2b276aa53a4a8ea16c6f48031d
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
index f7f02bcc31f6..d23590af5e34 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_dashboard https://github.com/ros-visualization/rqt_robot_dashboard
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_dashboard/archive/0.5.8.tar.gz -> rqt_robot_dashboard-0.5.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=13c2b74d4fb1d0d9bfd2c94770622ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
index 3b5c8d201a41..41d8333af935 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
@@ -1,16 +1,16 @@
 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/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_dashboard https://github.com/ros-visualization/rqt_robot_dashboard
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_console[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_nav_view[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=13c2b74d4fb1d0d9bfd2c94770622ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13
index 0f03942084c8..68601c316c0b 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Displays messages that are published by diagnostic_aggregator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_monitor https://github.com/ros-visualization/rqt_robot_monitor
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.13.tar.gz -> rqt_robot_monitor-0.5.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=959de8cb5b8de2f5820c9e8f2315c59c
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
index c814ec6d2f58..1f1bc33a9d0d 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
@@ -1,16 +1,16 @@
 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/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Displays messages that are published by diagnostic_aggregator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_monitor https://github.com/ros-visualization/rqt_robot_monitor
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/python_qt_binding[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_bag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=959de8cb5b8de2f5820c9e8f2315c59c
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.12 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.12
index 30182806dce9..968e1c488daf 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.12
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_steering https://github.com/ros-visualization/rqt_robot_steering
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.12.tar.gz -> rqt_robot_steering-0.5.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a36ec02c04b8ac243680549f49ec9294
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999 b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
index c0384d411317..dfafbe7d42fd 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_robot_steering https://github.com/ros-visualization/rqt_robot_steering
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=96d222cb0d47f69b7ccb351cdffcab76
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
index e9759a8e25e0..ef4de1dd483a 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_runtime_monitor/archive/0.5.8.tar.gz -> rqt_runtime_monitor-0.5.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ad941378a1cf74bb31ef324132edfcc
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
index 75d7a2ffc386..e900ae6ffb23 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
@@ -1,16 +1,16 @@
 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/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4ad941378a1cf74bb31ef324132edfcc
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1 b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
index 94b99c2f6b8e..fe00605f1bfe 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.6.1.tar.gz -> rqt_rviz-0.6.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35a2aa9428c930af81ee79dc142cccfd
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-9999 b/metadata/md5-cache/dev-ros/rqt_rviz-9999
index bfc735a516f9..11e9e1dc82c6 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-9999
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-9999
@@ -1,16 +1,16 @@
 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:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=35a2aa9428c930af81ee79dc142cccfd
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
index 6f30c20df9e0..e2f64f54b490 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_service_caller https://github.com/ros-visualization/rqt_service_caller
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_service_caller/archive/0.4.9.tar.gz -> rqt_service_caller-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=61229b35f7b2c28fc2a0f3b18fa25c8c
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-9999 b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
index d06dca5d20a8..759ce87aaf58 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-9999
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_service_caller https://github.com/ros-visualization/rqt_service_caller
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=61229b35f7b2c28fc2a0f3b18fa25c8c
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
index ba1eca8688e1..ece1e9ae45ed 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.10.tar.gz -> rqt_shell-0.4.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=269d72ae6ef97884c12bed51157b84f1
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-9999 b/metadata/md5-cache/dev-ros/rqt_shell-9999
index ee68ed43e23f..9cba04ddc36a 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-9999
+++ b/metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=269d72ae6ef97884c12bed51157b84f1
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
index 58d76e4ca5ab..f9b062cdfa21 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_srv https://github.com/ros-visualization/rqt_srv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_srv/archive/0.4.8.tar.gz -> rqt_srv-0.4.8.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-9999 b/metadata/md5-cache/dev-ros/rqt_srv-9999
index af0bfd76529f..0a773c3e825a 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-9999
+++ b/metadata/md5-cache/dev-ros/rqt_srv-9999
@@ -1,16 +1,16 @@
 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/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_srv https://github.com/ros-visualization/rqt_srv
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_msg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2
index aec146e22c24..08612a972e7e 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_tf_tree https://github.com/ros-visualization/rqt_tf_tree
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.6.2.tar.gz -> rqt_tf_tree-0.6.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d1641f4ed598644646fdb8f9bcf93630
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999 b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
index 9f23b015a030..aa467f95240e 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/mock[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_tf_tree https://github.com/ros-visualization/rqt_tf_tree
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_graph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d1641f4ed598644646fdb8f9bcf93630
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.9 b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
index 2ce67b906a10..8f342b9f08ed 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_top/archive/0.4.9.tar.gz -> rqt_top-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4c93ed0908343f114500103c996d8235
diff --git a/metadata/md5-cache/dev-ros/rqt_top-9999 b/metadata/md5-cache/dev-ros/rqt_top-9999
index 176dd602fa98..71da99eb5386 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-9999
+++ b/metadata/md5-cache/dev-ros/rqt_top-9999
@@ -1,16 +1,16 @@
 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-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4c93ed0908343f114500103c996d8235
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.12 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
index 342bd899035b..f7cc68ec9e25 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_topic https://github.com/ros-visualization/rqt_topic
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_topic/archive/0.4.12.tar.gz -> rqt_topic-0.4.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e355a9cc639c6d03feb11f96b86cd724
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-9999 b/metadata/md5-cache/dev-ros/rqt_topic-9999
index 5ac584614425..95c01020db9f 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-9999
+++ b/metadata/md5-cache/dev-ros/rqt_topic-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_topic https://github.com/ros-visualization/rqt_topic
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e355a9cc639c6d03feb11f96b86cd724
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.9 b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
index 9d60c6d2ff53..1556f2437948 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_web/archive/0.4.9.tar.gz -> rqt_web-0.4.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rqt_web-9999 b/metadata/md5-cache/dev-ros/rqt_web-9999
index 8fa9fbb8e0be..bddb5c9ce9a1 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-9999
+++ b/metadata/md5-cache/dev-ros/rqt_web-9999
@@ -1,16 +1,16 @@
 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-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rqt_gui_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/qt_gui[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.4 b/metadata/md5-cache/dev-ros/rviz-1.14.4
index 93de0e7dca91..62b6a368e194 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.14.4
+++ b/metadata/md5-cache/dev-ros/rviz-1.14.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-ros/cmake_modules virtual/pkgconfig sys-devel/make dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
 INHERIT=ros-catkin virtualx
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.4.tar.gz -> rviz-1.14.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=5cbc3baa5edd26bb271d2a842209b254
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index f6341f1f5696..ad221d26cf58 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
 INHERIT=ros-catkin virtualx
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54	virtualx	0a780e1ab49c75da33a78ede35ab8f9c
 _md5_=4042f68c8b1e376e09ed104a74bc0f51
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
index aa1361085723..372ed9d64b85 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RVIZ plugin for IMU visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=645787d6dcb34edaaf55f68612cd56eb
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
index e1fca3d747c2..d8df36c31d34 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
@@ -1,16 +1,16 @@
 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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=RVIZ plugin for IMU visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros/rviz dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=645787d6dcb34edaaf55f68612cd56eb
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
index 23fa762ce53e..852a61625ce3 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tutorials showing how to write plugins for RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_plugin_tutorials https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8a8d647f56c5fbd8623e89d5f4f2f07d
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
index da740da2263a..ca7e5545f8a0 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
@@ -1,16 +1,16 @@
 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/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tutorials showing how to write plugins for RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_plugin_tutorials https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8a8d647f56c5fbd8623e89d5f4f2f07d
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
index 5aa686bfa0ba..04e221f76aae 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rviz[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_python_tutorial https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rviz[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=61f21fef4ea62f70c698acd388806c40
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
index b6ee158267f9..770662c2f395 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
@@ -1,16 +1,16 @@
 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/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rviz[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_python_tutorial https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rviz[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=61f21fef4ea62f70c698acd388806c40
diff --git a/metadata/md5-cache/dev-ros/self_test-1.10.1 b/metadata/md5-cache/dev-ros/self_test-1.10.1
index 85a6b16385fc..dc4d17a9676e 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.10.1
+++ b/metadata/md5-cache/dev-ros/self_test-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-1.10.2 b/metadata/md5-cache/dev-ros/self_test-1.10.2
index 253f10e718be..db6b5ddc3016 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.10.2
+++ b/metadata/md5-cache/dev-ros/self_test-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-1.10.3 b/metadata/md5-cache/dev-ros/self_test-1.10.3
index b0767c3a6235..4c2e13ec2dad 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.10.3
+++ b/metadata/md5-cache/dev-ros/self_test-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b2ba3a84410101cd7682857700961ac8
diff --git a/metadata/md5-cache/dev-ros/self_test-1.10.4 b/metadata/md5-cache/dev-ros/self_test-1.10.4
index da1259fa2cf1..323db12ab975 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.10.4
+++ b/metadata/md5-cache/dev-ros/self_test-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b2ba3a84410101cd7682857700961ac8
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.4 b/metadata/md5-cache/dev-ros/self_test-1.9.4
index 045cf2c7951c..590f7fde99e9 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.4
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.6 b/metadata/md5-cache/dev-ros/self_test-1.9.6
index 73476fb51e26..67496d7c1e60 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.6
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-9999 b/metadata/md5-cache/dev-ros/self_test-9999
index 4730795e10a4..9a78ee66b4f2 100644
--- a/metadata/md5-cache/dev-ros/self_test-9999
+++ b/metadata/md5-cache/dev-ros/self_test-9999
@@ -1,16 +1,16 @@
 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/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0 b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
index 2bba10f22cce..1834d4ed737f 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eb569c38e9a80935bdce93993514b438
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.1 b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.1
index c56be645a181..8162571e783f 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b2d0646c12011f3b9307abe0a03ad792
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-9999 b/metadata/md5-cache/dev-ros/sensor_msgs-9999
index 0b4ff7d39669..8d734237cdb2 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-9999
@@ -1,16 +1,16 @@
 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=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=eb569c38e9a80935bdce93993514b438
diff --git a/metadata/md5-cache/dev-ros/settlerlib-0.10.14 b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
index 3bd563505924..0a201ae915a5 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-0.10.14
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Helper functions for creating a settler for a specific sensor channel
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/settlerlib https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=11d434e4a3edeb27b70f74af6c131c89
diff --git a/metadata/md5-cache/dev-ros/settlerlib-9999 b/metadata/md5-cache/dev-ros/settlerlib-9999
index 08ad77b49469..5d1d70e8705b 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-9999
+++ b/metadata/md5-cache/dev-ros/settlerlib-9999
@@ -1,16 +1,16 @@
 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:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Helper functions for creating a settler for a specific sensor channel
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/settlerlib https://github.com/ros-perception/calibration
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=11d434e4a3edeb27b70f74af6c131c89
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0 b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
index 16935ab73363..cc1ead9e7b06 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.13.1 b/metadata/md5-cache/dev-ros/shape_msgs-1.13.1
index 06d025e553c0..8d4dff7230b0 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b9b00506a2c203a520e986ca1eb78243
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-9999 b/metadata/md5-cache/dev-ros/shape_msgs-9999
index 2b8702621643..f449bc33f467 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/smach-2.5.0 b/metadata/md5-cache/dev-ros/smach-2.5.0
index c2f7f80120b6..4c4e46d34632 100644
--- a/metadata/md5-cache/dev-ros/smach-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach-2.5.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach https://github.com/ros/executive_smach
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=711e08053ee160d9fdb0ae1701db5597
diff --git a/metadata/md5-cache/dev-ros/smach-9999 b/metadata/md5-cache/dev-ros/smach-9999
index bb729da11776..ef82fcf86dc6 100644
--- a/metadata/md5-cache/dev-ros/smach-9999
+++ b/metadata/md5-cache/dev-ros/smach-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach https://github.com/ros/executive_smach
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=711e08053ee160d9fdb0ae1701db5597
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-2.5.0 b/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
index d98aaacd350a..29c977d0b243 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Set of messages that are used by the introspection interfaces for smach
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_msgs https://github.com/ros/executive_smach
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4e30ccac70cea974d168c81de129832c
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-9999 b/metadata/md5-cache/dev-ros/smach_msgs-9999
index d430c7b4e676..dfff3ead816d 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-9999
+++ b/metadata/md5-cache/dev-ros/smach_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Set of messages that are used by the introspection interfaces for smach
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_msgs https://github.com/ros/executive_smach
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4e30ccac70cea974d168c81de129832c
diff --git a/metadata/md5-cache/dev-ros/smach_ros-2.5.0 b/metadata/md5-cache/dev-ros/smach_ros-2.5.0
index 2ab68277f534..2c4718304963 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extensions for the SMACH library to integrate it tightly with ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_ros https://github.com/ros/executive_smach
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=27961f918090d44ff975c5aa43eb42e5
diff --git a/metadata/md5-cache/dev-ros/smach_ros-9999 b/metadata/md5-cache/dev-ros/smach_ros-9999
index a9626497b2a9..3a1599f69c7c 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-9999
+++ b/metadata/md5-cache/dev-ros/smach_ros-9999
@@ -1,16 +1,16 @@
 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/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Extensions for the SMACH library to integrate it tightly with ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach_ros https://github.com/ros/executive_smach
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=27961f918090d44ff975c5aa43eb42e5
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.5 b/metadata/md5-cache/dev-ros/smclib-1.8.5
index 258a586b19e4..3c8a3fff8adc 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.5
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The SMC converts the description of a state machine into source code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smclib https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.6 b/metadata/md5-cache/dev-ros/smclib-1.8.6
index 104ede599f42..bc549d12f579 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.6
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The SMC converts the description of a state machine into source code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smclib https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/smclib-9999 b/metadata/md5-cache/dev-ros/smclib-9999
index 616e78c05953..fa983b921f75 100644
--- a/metadata/md5-cache/dev-ros/smclib-9999
+++ b/metadata/md5-cache/dev-ros/smclib-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The SMC converts the description of a state machine into source code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smclib https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/stage_ros-1.8.0 b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
index c49921c45166..5058486d7a71 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.8.0
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS specific hooks and tools for the Stage simulator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stage_ros https://github.com/ros-simulation/stage_ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/stage_ros/archive/1.8.0.tar.gz -> stage_ros-1.8.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bbaf8d7621b7a78a591391356810f2f5
diff --git a/metadata/md5-cache/dev-ros/stage_ros-9999 b/metadata/md5-cache/dev-ros/stage_ros-9999
index d736a1801ed1..cda38082bd97 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -1,16 +1,16 @@
 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] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS specific hooks and tools for the Stage simulator
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stage_ros https://github.com/ros-simulation/stage_ros
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros/roscpp dev-ros/rostest dev-ros/sensor_msgs dev-ros/std_msgs dev-ros/tf x11-libs/fltk >=sci-electronics/Stage-4.3:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bbaf8d7621b7a78a591391356810f2f5
diff --git a/metadata/md5-cache/dev-ros/std_msgs-0.5.13 b/metadata/md5-cache/dev-ros/std_msgs-0.5.13
index aca735465472..357502a62353 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.13
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Standard ROS Messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/std_msgs/archive/0.5.13.tar.gz -> std_msgs-0.5.13.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f216de12e8cf869eb9480f4bffcb9997
diff --git a/metadata/md5-cache/dev-ros/std_msgs-9999 b/metadata/md5-cache/dev-ros/std_msgs-9999
index a3e62d8882c8..889f6212326f 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-9999
+++ b/metadata/md5-cache/dev-ros/std_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Standard ROS Messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f216de12e8cf869eb9480f4bffcb9997
diff --git a/metadata/md5-cache/dev-ros/std_srvs-1.11.3 b/metadata/md5-cache/dev-ros/std_srvs-1.11.3
index 09d88c2d10e5..229c91a4f965 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.3
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.3
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_srvs https://github.com/ros/ros_comm_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.3.tar.gz -> ros_comm_msgs-1.11.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2dde0c47eceaa51210d10fce577171e5
diff --git a/metadata/md5-cache/dev-ros/std_srvs-9999 b/metadata/md5-cache/dev-ros/std_srvs-9999
index 477cd5b9f005..ab56977108a3 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-9999
+++ b/metadata/md5-cache/dev-ros/std_srvs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_srvs https://github.com/ros/ros_comm_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2dde0c47eceaa51210d10fce577171e5
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
index dbdb122d8222..4d3a6b04a315 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
@@ -1,17 +1,17 @@
 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_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=52de8406f3d02fb7c1a5a97d9ed37038
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.3 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.3
index 0bba41eecaff..cc803722b83e 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.3
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.3
@@ -1,17 +1,17 @@
 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_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.3.tar.gz -> image_pipeline-1.15.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3b39b663995466adf81d9363cecf0c84
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-9999 b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
index a4203477f2dc..b11a33a9d99f 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -1,16 +1,16 @@
 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_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_image_proc https://github.com/ros-perception/image_pipeline
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=52de8406f3d02fb7c1a5a97d9ed37038
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0 b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
index e5419307a2b2..cd87e1df0ecd 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.1 b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.1
index d4abb6fed8db..d4b77afdfc61 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fe74d2d07b2c4d6aa9ee97dc8b45a6d0
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-9999 b/metadata/md5-cache/dev-ros/stereo_msgs-9999
index 693c3ba171be..7f2ac1725069 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.5 b/metadata/md5-cache/dev-ros/test_bond-1.8.5
index 8f4d336c69a0..c8eb570f0264 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9bb7581d661d49eba38425bd9de92410
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.6 b/metadata/md5-cache/dev-ros/test_bond-1.8.6
index 2b21da2c4c6c..bfb6326a9c32 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.6
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9bb7581d661d49eba38425bd9de92410
diff --git a/metadata/md5-cache/dev-ros/test_bond-9999 b/metadata/md5-cache/dev-ros/test_bond-9999
index 456e5835e356..df96d71f38e0 100644
--- a/metadata/md5-cache/dev-ros/test_bond-9999
+++ b/metadata/md5-cache/dev-ros/test_bond-9999
@@ -1,16 +1,16 @@
 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/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9bb7581d661d49eba38425bd9de92410
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
index 29e03561bd78..a491cba8101b 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.2 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.2
index 17e13ff6cde6..689f0427bf7f 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.2
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.2.tar.gz -> diagnostics-1.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.3 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.3
index 534763329231..baebe48bea6c 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.3
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.3.tar.gz -> diagnostics-1.10.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7dc2e241386b17775875de04ec932190
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.4 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.4
index 1d5cc3674564..f6a1566c4f4d 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.4
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.4.tar.gz -> diagnostics-1.10.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7dc2e241386b17775875de04ec932190
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
index 5af82b9a486a..b9b8a0c29d16 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
index 539bdce00f75..3f9292dca960 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
index e5454cde8a20..68ce447e6e64 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -1,16 +1,16 @@
 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/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.10.0 b/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
index b60a087685e1..faf9135c7514 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=492d9604646f82e6961c246e1d5f7c80
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.10.1 b/metadata/md5-cache/dev-ros/test_nodelet-1.10.1
index 17b8f05617b8..6f2265d38916 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.10.1
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.1.tar.gz -> nodelet_core-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4d54d407bd8a2f376ba70f453a37e462
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-9999 b/metadata/md5-cache/dev-ros/test_nodelet-9999
index c386e9d4d311..6e5740a26182 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet-9999
@@ -1,16 +1,16 @@
 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=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=492d9604646f82e6961c246e1d5f7c80
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
index 7c3cad0300b0..9ce5196c2258 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2004c75590a739b1ae4f88e9dc17e43a
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.1 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.1
index 35a20e52c8dc..1eb1052909f5 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.1
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.1.tar.gz -> nodelet_core-1.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6cd5b429069ead3e384d4eb3c2720327
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
index 67a23e314838..7d78972db9a4 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
@@ -1,16 +1,16 @@
 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/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2004c75590a739b1ae4f88e9dc17e43a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.10 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.10
index 28053ed0662e..21049a252709 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-1.15.10-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-1.15.10-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-1.15.10-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-1.15.10-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-1.15.10-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-1.15.10-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-1.15.10-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-1.15.10-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-1.15.10-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-1.15.10-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-1.15.10-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-1.15.10-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-1.15.10-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-1.15.10-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-1.15.10-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-1.15.10-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-1.15.10-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-1.15.10-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-1.15.10-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-1.15.10-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-1.15.10-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-1.15.10-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-1.15.10-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-1.15.10-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-1.15.10-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-1.15.10-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-1.15.10-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-1.15.10-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-1.15.10-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-1.15.10-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-1.15.10-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-1.15.10-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-1.15.10-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-1.15.10-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-1.15.10-test_rosbag_latched_pub.bag
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d6538470af41f1d4a352898fec139498
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.8 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
index 092850ed9076..e8875d057a85 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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 http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-1.15.8-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-1.15.8-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-1.15.8-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-1.15.8-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-1.15.8-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-1.15.8-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-1.15.8-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-1.15.8-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-1.15.8-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-1.15.8-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-1.15.8-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-1.15.8-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-1.15.8-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-1.15.8-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-1.15.8-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-1.15.8-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-1.15.8-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-1.15.8-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-1.15.8-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-1.15.8-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-1.15.8-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-1.15.8-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-1.15.8-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-1.15.8-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-1.15.8-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-1.15.8-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-1.15.8-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-1.15.8-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-1.15.8-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-1.15.8-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-1.15.8-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-1.15.8-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-1.15.8-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-1.15.8-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-1.15.8-test_rosbag_latched_pub.bag
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e4bb1302b4c10ae5fb94eaebfc2ef7e9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.9 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.9
index 61e04b8c86a1..dd65072d8b15 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-1.15.9-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-1.15.9-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-1.15.9-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-1.15.9-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-1.15.9-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-1.15.9-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-1.15.9-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-1.15.9-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-1.15.9-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-1.15.9-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-1.15.9-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-1.15.9-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-1.15.9-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-1.15.9-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-1.15.9-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-1.15.9-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-1.15.9-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-1.15.9-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-1.15.9-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-1.15.9-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-1.15.9-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-1.15.9-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-1.15.9-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-1.15.9-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-1.15.9-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-1.15.9-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-1.15.9-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-1.15.9-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-1.15.9-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-1.15.9-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-1.15.9-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-1.15.9-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-1.15.9-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-1.15.9-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-1.15.9-test_rosbag_latched_pub.bag
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e4bb1302b4c10ae5fb94eaebfc2ef7e9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-9999 b/metadata/md5-cache/dev-ros/test_rosbag-9999
index b4597c3bd0e0..8a9d5c3d647b 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-9999
@@ -1,17 +1,17 @@
 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/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/topic_tools[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-9999-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-9999-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-9999-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-9999-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-9999-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-9999-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-9999-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-9999-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-9999-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-9999-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-9999-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-9999-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-9999-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-9999-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-9999-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-9999-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-9999-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-9999-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-9999-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-9999-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-9999-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-9999-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-9999-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-9999-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-9999-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-9999-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-9999-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-9999-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-9999-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-9999-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-9999-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-9999-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-9999-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-9999-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-9999-test_rosbag_latched_pub.bag
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e4bb1302b4c10ae5fb94eaebfc2ef7e9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.10 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.10
index 8964131fe9e1..906d3aa07c6e 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=8aa0308acf31852a70c05368f2c453d1
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
index 590be6e6f868..43da798fa970 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0af2801fcc7f9a908b68b2ca52127fff
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.9 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.9
index 846b93038a59..8671c667c9fb 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ccb741cd674addcfa76d8f54ba889e57
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index bbb55137eb06..1708f545cfa6 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -1,16 +1,16 @@
 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/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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ccb741cd674addcfa76d8f54ba889e57
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.10 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.10
index 0dfd0cb1eb86..69d043837bf8 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d1fee206bc1745b53560b6f9e6c919ee
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
index fd88027e418f..217136cfcd4c 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3c7cb71ac18b5c95cf474d36238ded25
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.8 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
index 3ad73c6bc2aa..2f1df5fe4f88 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a944843d62bc1ec44d26ef9d0a1d1e3
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.9 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.9
index 2a86f480442d..17c13e6e4026 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a944843d62bc1ec44d26ef9d0a1d1e3
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-9999 b/metadata/md5-cache/dev-ros/test_roscpp-9999
index 16e24b19eae8..630b623ab3b2 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -1,16 +1,16 @@
 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-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6a944843d62bc1ec44d26ef9d0a1d1e3
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.10 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.10
index 1d49299ab2d1..e1fac7fe280c 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d5ec0cd6d7ac649d99c21dd046d2fc81
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
index 7b97023da92e..8150ab07487a 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ea8bbdfaa8fceb0d25bd3511ee272bad
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
index a9fe8c6404f7..82ad09bfa0f7 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1dc5594791bbf695641f5cc8b61fe9ca
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.9 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.9
index 61b8069471ca..8dcbf8509753 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1dc5594791bbf695641f5cc8b61fe9ca
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-9999 b/metadata/md5-cache/dev-ros/test_rosgraph-9999
index 09c5eb66d32b..cd8d4dc1122d 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-9999
@@ -1,16 +1,16 @@
 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/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1dc5594791bbf695641f5cc8b61fe9ca
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.10 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.10
index 2bf872d29bc6..7d2c98203b87 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d38f6dcc0781238b36494372990a343c
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
index d28a79870865..913cb15f0fbf 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=42d05e1b0987c6e0695ca83ddb45263b
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.9 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.9
index b7c289ef35d1..bd31be019384 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=42d05e1b0987c6e0695ca83ddb45263b
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-9999 b/metadata/md5-cache/dev-ros/test_roslaunch-9999
index ca9dd1dae7c1..fa3c0c04421d 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-9999
@@ -1,16 +1,16 @@
 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/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=42d05e1b0987c6e0695ca83ddb45263b
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.10 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.10
index c36c021d0246..5e06952fab93 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1a544e91c28ccf172862adfd1b27be93
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
index 75e756b8b034..dfd91f953f14 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f053b7cda85697de9d5d72c1c6edf769
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.9 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.9
index 481bbaa84550..c7addc0a77cf 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f053b7cda85697de9d5d72c1c6edf769
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-9999 b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
index 66e2979f23a7..3ed38ad34977 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
@@ -1,16 +1,16 @@
 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=test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/test_rosmaster dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f053b7cda85697de9d5d72c1c6edf769
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.10 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.10
index 67e5564e4b58..3c1390c6b91e 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d7be6188cf0136d537fa2cdfcce199b8
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
index a56bf8382ee2..91d232dd67b3 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3904ddbc3caac3c0a7d75bd6cacf6787
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.9 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.9
index 77af991b3799..977699ee01ca 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3904ddbc3caac3c0a7d75bd6cacf6787
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-9999 b/metadata/md5-cache/dev-ros/test_rosmaster-9999
index dfe34308b097..be76f03d91a5 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-9999
@@ -1,16 +1,16 @@
 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/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3904ddbc3caac3c0a7d75bd6cacf6787
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.10 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.10
index 0d3d85ea102e..3878c2f5ed19 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0963ae93ba4f06ca0bac13ea1a3242ce
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
index 9d1e2168ea62..2f0f0045066d 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a915e73918dc0b1e6532bf58379010b9
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.8 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
index e59a70b2ecd0..5a119b28e7c2 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bf1ea5b2f818e3a6af3cde288391abaa
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.9 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.9
index c81b658d1248..73f6c2f7bbf2 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bf1ea5b2f818e3a6af3cde288391abaa
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-9999 b/metadata/md5-cache/dev-ros/test_rosparam-9999
index bc53e4a39e22..b48b5634c2e2 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-9999
@@ -1,16 +1,16 @@
 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/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rosparam[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bf1ea5b2f818e3a6af3cde288391abaa
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.10 b/metadata/md5-cache/dev-ros/test_rospy-1.15.10
index 50ea07f13ea4..0281273a2b6e 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f10b7fbd53c7075ed84cdff064407f3a
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.8 b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
index 6e72f0096902..4d81fc5fb30d 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2bf8b3e7f987d1a71114e2f3f5a9c45c
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.9 b/metadata/md5-cache/dev-ros/test_rospy-1.15.9
index 4bd745e26bfb..4b762065e897 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2bf8b3e7f987d1a71114e2f3f5a9c45c
diff --git a/metadata/md5-cache/dev-ros/test_rospy-9999 b/metadata/md5-cache/dev-ros/test_rospy-9999
index c2d2b0103356..46ad0cd598f1 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-9999
@@ -1,16 +1,16 @@
 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/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2bf8b3e7f987d1a71114e2f3f5a9c45c
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.10 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.10
index 20a5fbe30769..fae03fa12b28 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.10
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ab4a106114d2b4c730f079dc3a858097
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.8 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
index 64c1864250b3..973ca3bc877d 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=67319b6f687dc3ed76dd7dd11fe1b16e
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.9 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.9
index 7c623a04cd9b..38c90e21c7d1 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.9
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=67319b6f687dc3ed76dd7dd11fe1b16e
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-9999 b/metadata/md5-cache/dev-ros/test_rosservice-9999
index 9cff3f980029..405ab6ec23a0 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-9999
@@ -1,16 +1,16 @@
 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/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosservice[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=67319b6f687dc3ed76dd7dd11fe1b16e
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.2 b/metadata/md5-cache/dev-ros/test_tf2-0.7.2
index 181a3feda7da..e704b9087f72 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.3 b/metadata/md5-cache/dev-ros/test_tf2-0.7.3
index 9ac3f2e6b168..0c608bea02c6 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.3
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.5 b/metadata/md5-cache/dev-ros/test_tf2-0.7.5
index f3c468b1cb1d..eb6140b898ca 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.5
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/test_tf2-9999 b/metadata/md5-cache/dev-ros/test_tf2-9999
index f6615bee80c9..ee7e416fa724 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -1,16 +1,16 @@
 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/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_kdl[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs dev-ros/rosbash sci-libs/orocos_kdl python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-libs/boost:=[threads] dev-cpp/gtest python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/tf-1.13.2-r1 b/metadata/md5-cache/dev-ros/tf-1.13.2-r1
index c797fafecd17..66ecb83383a2 100644
--- a/metadata/md5-cache/dev-ros/tf-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/tf-1.13.2-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Maintains the relationship between frames in a tree structure over time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6e0b8bea286f98d9554e1208e0d07c1e
diff --git a/metadata/md5-cache/dev-ros/tf-9999 b/metadata/md5-cache/dev-ros/tf-9999
index 7a62401629d9..89492aca1cdc 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -1,16 +1,16 @@
 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/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Maintains the relationship between frames in a tree structure over time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros/rosconsole dev-ros/rostime dev-ros/roscpp dev-ros/tf2_ros dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/rospkg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/rospkg[python_targets_python3_9(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6e0b8bea286f98d9554e1208e0d07c1e
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.2 b/metadata/md5-cache/dev-ros/tf2-0.7.2
index cb0f1797eee8..c31bf9d61fce 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.3 b/metadata/md5-cache/dev-ros/tf2-0.7.3
index 76173b7c564a..2bb76c18d86b 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.5 b/metadata/md5-cache/dev-ros/tf2-0.7.5
index 9055b80da8c5..befa86e2d8ce 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2-9999 b/metadata/md5-cache/dev-ros/tf2-9999
index 679a867d970b..34059d51c544 100644
--- a/metadata/md5-cache/dev-ros/tf2-9999
+++ b/metadata/md5-cache/dev-ros/tf2-9999
@@ -1,16 +1,16 @@
 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:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/roscpp dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
index 1fed836238ad..db9d248a368f 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
index 6a8d3494f368..8ed92e4786e2 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
index b6f607bcd937..b2500c1647de 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-9999 b/metadata/md5-cache/dev-ros/tf2_bullet-9999
index d2ef23c8ab4b..cac84ed7f6b2 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-9999
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-9999
@@ -1,16 +1,16 @@
 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-ros/tf2 sci-physics/bullet dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
index 47571baa963c..7a74dfa7d272 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
index 2de761fcd471..d5075bac81f8 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
index e0e968e4e37e..3deb9b87a3ac 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-9999 b/metadata/md5-cache/dev-ros/tf2_eigen-9999
index 07483ce672b1..f2339988379a 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-9999
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-9999
@@ -1,16 +1,16 @@
 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/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
index 3c4fde3e7c5d..5cdf495b36c3 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
index 30992a1dc6e1..58c9cec6c290 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
index 9e358497894a..1dcc72a0630c 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
index abeff71970a4..c7887b970735 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
@@ -1,16 +1,16 @@
 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/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
index babeb5446ed4..cf264b14a8c7 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
index fc41a2831286..e7511981dd4f 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
index 9d6e10542035..ad6711ab4ec6 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-9999 b/metadata/md5-cache/dev-ros/tf2_kdl-9999
index 1bd6268c72b1..fef2c1175653 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-9999
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-9999
@@ -1,16 +1,16 @@
 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/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
index d5dccd34b607..897ce7752578 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
index 70aef77642d6..ef35e511e03a 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
index 29287116dbb3..3e324333431f 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_msgs-9999
index 652f9bc945ef..a94d6f823e08 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.2 b/metadata/md5-cache/dev-ros/tf2_py-0.7.2
index 01276e6e5e41..176368df87ab 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.3 b/metadata/md5-cache/dev-ros/tf2_py-0.7.3
index 765ad4d3b6a2..cb8dd4653be8 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.5 b/metadata/md5-cache/dev-ros/tf2_py-0.7.5
index a33ae4b4c57a..882f81ddce3e 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-9999 b/metadata/md5-cache/dev-ros/tf2_py-9999
index e2b61a8c6c29..d527ce7196d1 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-9999
+++ b/metadata/md5-cache/dev-ros/tf2_py-9999
@@ -1,16 +1,16 @@
 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/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.2 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
index acf17d003fd8..c863a4584925 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.3 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
index f8e2801c0b0e..eb464bbc91fc 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.5 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
index ddb18c68bac3..753ee79c8ce4 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-9999 b/metadata/md5-cache/dev-ros/tf2_ros-9999
index 280e0797b759..aa18a1763519 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -1,16 +1,16 @@
 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/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_ros https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
index d1e0afe34269..172e5ef6c54f 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
index 410a9b00cc80..1a16f20fd785 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
index 0a4158f0707e..8d0ac58fb8d2 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
index 401f98c3ab46..50bde45d367a 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
@@ -1,16 +1,16 @@
 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/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/gtest ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.2 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
index 3f4170377dc9..612855269e32 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.3 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
index 5596de76ec14..2a17014a2c0e 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.5 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
index ccc338915794..a1069992cb1d 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-9999 b/metadata/md5-cache/dev-ros/tf2_tools-9999
index 560fabb1e476..0b53bd09439c 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-9999
+++ b/metadata/md5-cache/dev-ros/tf2_tools-9999
@@ -1,16 +1,16 @@
 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/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_py[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslib[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1 b/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
index 6358f5d55c81..77b9e3e362e8 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Functions to convert common tf datatypes into those used by other libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf_conversions https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e3061d265d5b768e6fdc234bd1cf8f7e
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-9999 b/metadata/md5-cache/dev-ros/tf_conversions-9999
index ad35a05c624f..35e1d2c7bfe4 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-9999
+++ b/metadata/md5-cache/dev-ros/tf_conversions-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=Functions to convert common tf datatypes into those used by other libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf_conversions https://github.com/ros/geometry
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/python_orocos_kdl[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python_orocos_kdl[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e3061d265d5b768e6fdc234bd1cf8f7e
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
index 8600ad57fdc7..e00155f64d01 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Plugin for transparently sending an image stream encoded with the Theora codec
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/theora_image_transport https://github.com/ros-perception/image_transport_plugins
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e8ec5aaf31998424597dc48252b348b
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-9999 b/metadata/md5-cache/dev-ros/theora_image_transport-9999
index a16148e6a726..08f3e8624fa7 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-9999
@@ -1,16 +1,16 @@
 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-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Plugin for transparently sending an image stream encoded with the Theora codec
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/theora_image_transport https://github.com/ros-perception/image_transport_plugins
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0e8ec5aaf31998424597dc48252b348b
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.9 b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.9
index 8bad624ffd6b..1e4714f419cc 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.9
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslib dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/timestamp_tools https://github.com/ros-drivers/driver_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.9.tar.gz -> driver_common-1.6.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=188aae8e32feb4f9f14faab7996ffaaf
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-9999 b/metadata/md5-cache/dev-ros/timestamp_tools-9999
index a49640963008..9ff9ca22ab3d 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-9999
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-9999
@@ -1,16 +1,16 @@
 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/roslib dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/timestamp_tools https://github.com/ros-drivers/driver_common
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=188aae8e32feb4f9f14faab7996ffaaf
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.10-r1 b/metadata/md5-cache/dev-ros/topic_tools-1.15.10-r1
index 637654615291..497d1b0c84a3 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.15.10-r1
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.10-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbash[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbash[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47d44aaf842c46d614bc8c272a0852e7
diff --git a/metadata/md5-cache/dev-ros/topic_tools-9999 b/metadata/md5-cache/dev-ros/topic_tools-9999
index 0019b49a6bb5..7c4fd21bbf01 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_tools-9999
@@ -1,16 +1,16 @@
 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 dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbash[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosunit[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosbash[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rostopic[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rosmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=47d44aaf842c46d614bc8c272a0852e7
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
index 66d868942eb9..2462e83b9b15 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.1 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.1
index 77372be49f21..9c4b9e3bbadb 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=de8da0dacc3589c0b0ba905ebc535fea
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-9999 b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
index b7cd09c2c431..a4645c69aa58 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
index 15941209e741..b62d2cc4db59 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.2 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
index d3ea6f83d731..1a71a4927f35 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.3 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.3
index d18fe5bfd34e..018bb72e5ef1 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.3
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.3.tar.gz -> ros_control-0.19.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.4 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.4
index ad24651024f0..ee07f3d1b710 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.4
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.4
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.4.tar.gz -> ros_control-0.19.4.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=78e3d2a43f6bf50fb8a8c9f6de68b54e
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-9999 b/metadata/md5-cache/dev-ros/transmission_interface-9999
index e35fe9f8eca0..0226ea58ae63 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-9999
@@ -1,16 +1,16 @@
 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/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
index d1b7e655c054..4de31123ed81 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
index 5c400f05947c..930c7580383a 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-9999 b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
index 2d595e06c9e8..de66405ca81f 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
@@ -1,16 +1,16 @@
 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/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-0.2.3 b/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
index 8b5fbc948b13..844ac6bef2ec 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ae62db7e6c587787a0a6ca43de3278e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-9999 b/metadata/md5-cache/dev-ros/turtle_tf-9999
index f148c8e48e75..1198b9e534c3 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -1,16 +1,16 @@
 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-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf https://github.com/ros/geometry_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=2ae62db7e6c587787a0a6ca43de3278e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3 b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
index 2049dd456a40..cce6b01123ec 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=829faea29e10805c1a1ece323ba5634d
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-9999 b/metadata/md5-cache/dev-ros/turtle_tf2-9999
index c88cd0266813..6350772952e5 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -1,16 +1,16 @@
 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/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_tf2 https://github.com/ros/geometry_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/turtlesim[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=829faea29e10805c1a1ece323ba5634d
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.10.1 b/metadata/md5-cache/dev-ros/turtlesim-0.10.1
index 04932971c474..d8d1236e059e 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.10.2 b/metadata/md5-cache/dev-ros/turtlesim-0.10.2
index 69eceefc31c7..2895f1a8eada 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.2
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/turtlesim-9999 b/metadata/md5-cache/dev-ros/turtlesim-9999
index 9e56f69002a4..ccc8bbf44d35 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-9999
+++ b/metadata/md5-cache/dev-ros/turtlesim-9999
@@ -1,16 +1,16 @@
 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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/roslib dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/unique_id-1.0.6 b/metadata/md5-cache/dev-ros/unique_id-1.0.6
index 36ea7d488ff7..b220ae42e4e2 100644
--- a/metadata/md5-cache/dev-ros/unique_id-1.0.6
+++ b/metadata/md5-cache/dev-ros/unique_id-1.0.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Python and C++ interfaces for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/unique_id https://github.com/ros-geographic-info/unique_identifier
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0f009a9db53f130d43c8253925e396c3
diff --git a/metadata/md5-cache/dev-ros/unique_id-9999 b/metadata/md5-cache/dev-ros/unique_id-9999
index 81eecad57ee3..09860453061d 100644
--- a/metadata/md5-cache/dev-ros/unique_id-9999
+++ b/metadata/md5-cache/dev-ros/unique_id-9999
@@ -1,16 +1,16 @@
 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/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=ROS Python and C++ interfaces for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/unique_id https://github.com/ros-geographic-info/unique_identifier
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0f009a9db53f130d43c8253925e396c3
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.2 b/metadata/md5-cache/dev-ros/urdf-1.13.2
index e0d84e72acf3..8e1643355780 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.13.2
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=87c135a1d691b5036f1f27be3700dc98
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index c9a82e334b6a..0ab9c9c20eef 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -1,16 +1,16 @@
 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-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=87c135a1d691b5036f1f27be3700dc98
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
index 168d0a0c2955..0f2f1c4d145a 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/urdfdom_headers python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
index f51ba8f2778a..cfb91be3640f 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
@@ -1,16 +1,16 @@
 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/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-libs/urdfdom_headers python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
index e86c6a078f97..89c2693d52c9 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=URDF tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_tutorial/archive/0.5.0.tar.gz -> urdf_tutorial-0.5.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ca20dd2bc9cccac68bda81c9e6e8914f
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-9999 b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
index b1dea61ea946..2c035722d9cb 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
@@ -1,16 +1,16 @@
 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 dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=URDF tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=ca20dd2bc9cccac68bda81c9e6e8914f
diff --git a/metadata/md5-cache/dev-ros/urg_c-1.0.405 b/metadata/md5-cache/dev-ros/urg_c-1.0.405
index 2f679bddaec6..d7ab830864eb 100644
--- a/metadata/md5-cache/dev-ros/urg_c-1.0.405
+++ b/metadata/md5-cache/dev-ros/urg_c-1.0.405
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=URG Helper / URG Widget / URG Library / urg_c
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_c https://github.com/ros-drivers/urg_c
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_c/archive/1.0.405.tar.gz -> urg_c-1.0.405.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1be427a884cf104a28fb052f00135c47
diff --git a/metadata/md5-cache/dev-ros/urg_c-9999 b/metadata/md5-cache/dev-ros/urg_c-9999
index 26e35626b01b..898ef694553c 100644
--- a/metadata/md5-cache/dev-ros/urg_c-9999
+++ b/metadata/md5-cache/dev-ros/urg_c-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=URG Helper / URG Widget / URG Library / urg_c
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_c https://github.com/ros-drivers/urg_c
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=1be427a884cf104a28fb052f00135c47
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.15 b/metadata/md5-cache/dev-ros/urg_node-0.1.15
index 1d5ccb901704..cb07934f6d25 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.15
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.15
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_node https://github.com/ros-drivers/urg_node
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.15.tar.gz -> urg_node-0.1.15.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0cbce7a540fe7cc5b53ccb961abf79a7
diff --git a/metadata/md5-cache/dev-ros/urg_node-9999 b/metadata/md5-cache/dev-ros/urg_node-9999
index 4d88e4ff7b0d..b0db19418aee 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
+DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/roslint dev-ros/roslaunch ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urg_node https://github.com/ros-drivers/urg_node
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=0cbce7a540fe7cc5b53ccb961abf79a7
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6 b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
index 779c2465e3f2..32e5927b91f2 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/uuid_msgs https://github.com/ros-geographic-info/unique_identifier
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ce3229db0b1c2ed3f5aa1837255b65c
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-9999 b/metadata/md5-cache/dev-ros/uuid_msgs-9999
index 99e15436d5f7..2c27aab38b5e 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-9999
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/uuid_msgs https://github.com/ros-geographic-info/unique_identifier
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=3ce3229db0b1c2ed3f5aa1837255b65c
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
index 2feafad7c7b9..d2af447837be 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4aa24a60b7627a12f7cdd66dae23803c
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999 b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
index 8d6fdde4d3a8..f5aca09f6eb7 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -1,16 +1,16 @@
 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/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_auto_tracker https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] media-libs/opencv:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=4aa24a60b7627a12f7cdd66dae23803c
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1 b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
index 594da5ed8cf5..3a2c9c331254 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=00ebeb1636ad11ff4ccd40191a09d4b1
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-9999 b/metadata/md5-cache/dev-ros/visp_bridge-9999
index 48e69cda845e..83ecbabb6919 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -1,16 +1,16 @@
 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=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=00ebeb1636ad11ff4ccd40191a09d4b1
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
index f482f86dd3ac..734ceed53e9f 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_camera_calibration https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=34458dd0a6aa5a824a7f505d3edfa072
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index 573e5c6a0e71..4993ab5b4db0 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -1,16 +1,16 @@
 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/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_camera_calibration https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:=[X] dev-libs/boost:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=34458dd0a6aa5a824a7f505d3edfa072
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
index 87cbedda6a6d..ebb829ad14e9 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Estimates the camera position with respect to its effector using ViSP
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_hand2eye_calibration https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e7e7c3f94c2fa300363c271e15607085
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
index 1b8c56e4371e..cca235e3ac72 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -1,16 +1,16 @@
 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/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Estimates the camera position with respect to its effector using ViSP
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_hand2eye_calibration https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=e7e7c3f94c2fa300363c271e15607085
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1 b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
index 7f0a8f7e029f..ddd6bfd3cfe9 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_tracker https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64312a362150d743d60275643dbb6419
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index 51c75c8884bc..a598807a3f14 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -1,16 +1,16 @@
 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/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_tracker https://github.com/lagadic/vision_visp
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/rospy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=64312a362150d743d60275643dbb6419
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
index 475755ee3646..a0bf0560d444 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp dev-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Visualization marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=85f821ba642794aa79522b06a338b160
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
index eb64eadc49b2..3ba4c275d47a 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
@@ -1,16 +1,16 @@
 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-ros/visualization_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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Visualization marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=85f821ba642794aa79522b06a338b160
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
index a0522c0c5e1d..2a85003066af 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.7.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0 b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
index 12734eab3a16..5a793f9e76b9 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.1 b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.1
index 6b99c58700c9..5dcd1ea2042e 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.1
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.1
@@ -1,17 +1,17 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.1.tar.gz -> common_msgs-1.13.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=529008356428c39873d0d99d98b7c1b8
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-9999 b/metadata/md5-cache/dev-ros/visualization_msgs-9999
index 54a1df794fd4..2d9fb5f2e561 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-9999
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-9999
@@ -1,16 +1,16 @@
 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=python_single_target_python3_8 python_single_target_python3_9 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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] ) 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_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.16.6 b/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
index 264b8a929f5e..842c088cd773 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0 b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
index 16501133ffaf..0db8462824e8 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.17.1 b/metadata/md5-cache/dev-ros/voxel_grid-1.17.1
index 0794d892ec95..2c977aca929d 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.17.1
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.17.1
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roscpp 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.1.tar.gz -> navigation-1.17.1.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-9999 b/metadata/md5-cache/dev-ros/voxel_grid-9999
index fda6be2dfcf7..7f9122a11c6c 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-9999
+++ b/metadata/md5-cache/dev-ros/voxel_grid-9999
@@ -1,16 +1,16 @@
 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 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/xacro-1.14.6 b/metadata/md5-cache/dev-ros/xacro-1.14.6
index 13520722a978..976260ede2db 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.14.6
+++ b/metadata/md5-cache/dev-ros/xacro-1.14.6
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=XML macro language
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.14.6.tar.gz -> xacro-1.14.6.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=7ae2445021ff4e4bad6560ca974de14e
diff --git a/metadata/md5-cache/dev-ros/xacro-9999 b/metadata/md5-cache/dev-ros/xacro-9999
index 38a2b300ab62..593b7a63d4bd 100644
--- a/metadata/md5-cache/dev-ros/xacro-9999
+++ b/metadata/md5-cache/dev-ros/xacro-9999
@@ -1,16 +1,16 @@
 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/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] test? ( dev-ros/rostest[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=XML macro language
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/roslint[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] dev-ros/roslaunch[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=864fe4d3a403fd1489a8366372d84461
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.10 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.10
index d81737bed0d7..73b52ae62a5d 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.10
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.10
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.10.tar.gz -> ros_comm-1.15.10.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=6eef3c2e4225cc462deeaf462ce1d495
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
index d8fb1f615608..53e10dd9ef18 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 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_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9
index 0e63555ba77f..a95643dce55a 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.9
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.9.tar.gz -> ros_comm-1.15.9.tar.gz
-_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index e428a53f1e5c..75492e70ae22 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -1,16 +1,16 @@
 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 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_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rostime test? ( dev-cpp/gtest dev-libs/boost[threads] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/catkin[python_targets_python3_9(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/empy[python_targets_python3_9(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
 INHERIT=ros-catkin
-IUSE=python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 test
+IUSE=python_single_target_python3_8 python_single_target_python3_9 test
 LICENSE=BSD
 PROPERTIES=live
-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] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
+_eclasses_=git-r3	b8e8c92aa5fe8df7187e466138eb4e52	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	xdg-utils	ff2ff954e6b17929574eee4efc5152ba	cmake	518e4c9a6a38dfd7afc54b6a7c5de3da	ros-catkin	0e2ee4c872fdd9df6b66002912d67e54
 _md5_=63f7cee17e2df190dc6e2752710315ae